Merge "Stable Branching for availability project"