Merge changes Iec23e69e,I6437eab9 into devel/master