Merge changes Idfd11a5b,I02aab7c1