Merge changes Icccc1ca3,Ia32ce8ab into devel/master