Merge changes I4bb1c7db,Ief5d0401