Merge changes Ic9dba03a,Id5ec87c1 into devel/master