Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/36811 and https://gitlab.com/gitlab-org/gitlab-ce/issues/36812 but not https://gitlab.com/gitlab-org/gitlab-ce/issues/36810.