Merge branch alfroch-master-patch-55941 with refs/merge-requests/561/train...

Merge branch alfroch-master-patch-55941 with refs/merge-requests/561/train into refs/merge-requests/574/train
51 jobs for !574 with alfroch-master-patch-55941 into master in 16 minutes and 27 seconds (queued for 3 seconds)
merge train