Merge changes Ic13414f0,I26085bfc