Merge changes Ic28f8ec1,If8d817c4 into devel/master