Merge changes Ia2ec4b45,Ied29583a into devel/master