Merge branch alfroch-fix-continue-training with refs/heads/master into...

Merge branch alfroch-fix-continue-training with refs/heads/master into refs/merge-requests/516/train
49 jobs for !516 with alfroch-fix-continue-training into master in 17 minutes and 44 seconds (queued for 3 seconds)
merge train