Feature post release cleaning

Merged Mark OLESEN requested to merge feature-post-release-cleaning into develop

A few commits that somehow slipped through a rebase

Merge request reports