Merge branch alfroch-fixing-eval-issue with refs/heads/master into refs/merge-requests/596/train

51 jobs for !596 with alfroch-fixing-eval-issue into master in 12 minutes and 28 seconds (queued for 9 seconds)
merge train