Merge changes Id68de4e3,Id4b3c97f