Merge branch alfroch-fix-small-issues with refs/heads/master into refs/merge-requests/576/train

50 jobs for !576 with alfroch-fix-small-issues into master in 12 minutes and 12 seconds (queued for 3 seconds)
merge train