Merge branch feature/jorgen.lind/build_script_update with refs/heads/master...

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