Merge changes I4ec69712,I8348002a,I7e6abbf1,Idc2294da