Merge changes I305a96fb,Ief4bb355