Merge changes I8c23739a,Ia0e70828