Merge changes Id1ac2f8b,I48f8cd17,I10481ce6,Id4530499