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