Merge changes I17a289cd,Ie0d50a2c