Merge branch '2727-gitlab-issues' into 'develop'