Merge changes I1aa3b081,I65ee788c,I58a9cdfe