Merge changes I16a5683b,I6081dc12