Merge changes Ic6cb8725,Ie533ed3e