Update 2.1 branch

Jørgen Lindrequested to merge
feature/jorgen.lind/update_2.1 into 2.1

We are not releasing yet, but updating the branch in preparation for releasing next week

Merge request reports