Closes https://gitlab.com/gitlab-data/analytics/issues/1096 https://gitlab.com/gitlab-data/analytics/issues/1142