Merge changes Iddfdf664,Ifd7f98a4