Merge changes I34538a22,I520b0d83