Merge changes I7057c2e0,Id1fc9c87