Merge changes Ib7c620f5,I75f6d47b into devel/master