Merge branch feature/jorgen.lind/upgrade_aws with refs/heads/master into...
Merge branch feature/jorgen.lind/upgrade_aws with refs/heads/master into refs/merge-requests/429/train
Merge branch feature/jorgen.lind/upgrade_aws with refs/heads/master into refs/merge-requests/429/train