Closes https://gitlab.com/gitlab-data/analytics/-/issues/17658
Closes https://gitlab.com/gitlab-data/analytics/-/issues/17929