Merge changes Ic8e48ed1,Ie6bc9bbf,I3e94c637,I84c8ac42