Merge changes I5f332ce6,Ia1e76629