Merge changes Id6b8ba01,Ic4081b36