Merge changes I22942d24,Ia90f85d3