Merge branch master with refs/heads/112-flexible-validation-test-file-definition into refs/merge-requests/342/train