Update manager branch with the newest changes from master

We could do this, or a painful huge rebase. I prefer merge as it does not break anything except for somewhat weird git history.

Merge request reports

Loading