Merge changes I24adce35,Ia5947ae6