Merge branch birk-generalise-validation-files with...

Merge branch birk-generalise-validation-files with refs/heads/112-flexible-validation-test-file-definition into refs/merge-requests/341/train