Merge changes I1b834def,Iece78be2