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

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