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

47 jobs for !455 with alfroch-fix-small-issues into master in 31 minutes and 57 seconds (queued for 5 seconds)
merge train