Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8664#note_22853522
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8664#note_22853463
Closes #26921