Merge changes Ie600f25f,I99deeb57,I63bddcfe