Merge branch alfroch-master-patch-19052 with refs/heads/master into refs/merge-requests/236/train

22 jobs for !236 with alfroch-master-patch-19052 into master in 27 minutes and 33 seconds (queued for 1 second)
merge train