Merge changes I525c2070,Ib920ff67