Merge branch alfroch-adding-val-config with refs/heads/master into refs/merge-requests/271/train

30 jobs for !271 with alfroch-adding-val-config into master in 10 minutes and 22 seconds (queued for 4 seconds)
merge train