Merge branch alfroch-master-patch-58150 with refs/heads/master into refs/merge-requests/277/train

27 jobs for !277 with alfroch-master-patch-58150 into master in 10 minutes and 18 seconds (queued for 1 second)
merge train