Merge changes Id8107d24,I8c63dcc8