Merge changes Ia06b7afe,I31b646b4