Merge changes Ibcc99fc9,I8d1202b2 into devel/master