Merge changes I0e8c20b4,Id6b80c7e