Merge changes I4174e4f9,I99fa044e,I07c80e2f