Merge branch alfroch-fix-179 with refs/heads/master into refs/merge-requests/535/train

50 jobs for !535 with alfroch-fix-179 into master in 19 minutes and 17 seconds (queued for 3 seconds)
merge train