closes https://gitlab.com/gitlab-org/quality/nightly/issues/30 closes https://gitlab.com/gitlab-org/quality/nightly/issues/34