Port of CE community contribution

What does this MR do?

Ports https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24698 to EE on behalf of @krajakavitha.

CC @rpaik.

Related issues

None.

Author's checklist

• Apply the correct labels and milestone
• Port the MR to EE (or backport from CE): https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24698

Review checklist

• Technical writer's review (required)
• Merge the EE-MR first, CE-MR afterwards (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24698)