Merge changes I56f29eac,Ic7530d44