Merge changes I114cbac1,I45c2e7cd