Merge changes I1ed16552,Ia080da84