Merge branch alfroch-consistent-naming with refs/heads/master into refs/merge-requests/570/train

50 jobs for !570 with alfroch-consistent-naming into master in 12 minutes and 36 seconds (queued for 3 seconds)
merge train