Merge branch feature/jorgen.lind/aws_update with refs/heads/master into...

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