Merge changes I95651dbd,If52f42c5