Merge changes Id2bb5c7d,I341f0ca7