Merge changes I9b7a3d37,I10a859ad,Ia5eed214,I90dbd994,I41896003, ...