Merge branch alfroch-master-patch-48661 with refs/heads/master into refs/merge-requests/245/train

25 jobs for !245 with alfroch-master-patch-48661 into master in 9 minutes and 34 seconds (queued for 2 seconds)
merge train