Merge changes I219c2b3a,I7af6fe67