Merge changes I157879d0,Ia4dc73f6