Merge changes I5acd9c57,I90e7a69e