Bring back reverted Gold Trial MR (CE backport)

What does this MR do?

EE: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8731

Revert https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23619

Restoring

• https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8571

• https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8635

Picking fix https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8674

What are the relevant issue numbers?

Does this MR meet the acceptance criteria?

• Changelog entry added, if necessary
• Documentation created/updated
• Tests added for this feature/bug
• Conforms to the code review guidelines
• Conforms to the merge request performance guidelines
• Conforms to the style guides
• Conforms to the database guides
• Link to e2e tests MR added if this MR has Requires e2e tests label. See the Test Planning Process.
• Security reports checked/validated by reviewer