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