Merge branch alfroch-master-patch-66381 with refs/heads/master into refs/merge-requests/418/train

43 jobs for !418 with alfroch-master-patch-66381 into master in 20 minutes and 26 seconds (queued for 4 seconds)
merge train