Merge branch sync_with_2.0 with refs/heads/master into refs/merge-requests/358/train

3 jobs for !358 with sync_with_2.0 into master in 36 minutes and 38 seconds
merge train