Merge changes Ic282f482,I10fc7c7d,I00d8d5f7