Merge branch feature/jorgen.lind/fixes_many_linux_2.1 with refs/heads/2.1 into...

Merge branch feature/jorgen.lind/fixes_many_linux_2.1 with refs/heads/2.1 into refs/merge-requests/521/train