closes https://gitlab.com/gitlab-jh/gitlab/-/issues/483 and https://gitlab.com/gitlab-jh/gitlab/-/issues/482