Merge branch 'develop' into feature_ros_external_api