Merge changes Iebb3261e,I67abf9f4 into devel/master