Merge changes Id24d9bb0,I6807ed25