Merge branch alfroch-fix-memory-issues with refs/heads/master into refs/merge-requests/304/train

31 jobs for !304 with alfroch-fix-memory-issues into master in 16 minutes and 28 seconds (queued for 4 seconds)
merge train