WIP: Resolve "GitLab Issue"

Closed username-removed-236961 requested to merge 1395-gitlab-issue into master