Merge "Stability improvements"