Merge branch alfroch-fix-branch-unit-tests with refs/heads/master into...

Merge branch alfroch-fix-branch-unit-tests with refs/heads/master into refs/merge-requests/478/train
45 jobs for !478 with alfroch-fix-branch-unit-tests into master in 22 minutes and 52 seconds (queued for 4 minutes and 10 seconds)
merge train