Bugfix/ci rest fixes

David Nicholsrequested to merge
bugfix/ci_rest_fixes into develop

Merge request reports