Merge changes I7c36c88e,I7c5d97c7