Merge Train MVC

This is a new issue to synthesize https://gitlab.com/gitlab-org/gitlab-ee/issues/7380 and https://gitlab.com/gitlab-org/gitlab-ce/issues/23902 into a single MVC

Problem to Solve

Proposal