Merge branch feature/morten.ofstad/FixOptionalHeader with refs/heads/master...
Merge branch feature/morten.ofstad/FixOptionalHeader with refs/heads/master into refs/merge-requests/390/train
Merge branch feature/morten.ofstad/FixOptionalHeader with refs/heads/master into refs/merge-requests/390/train