Merge pull request #14272 from artfulrobot/artfulrobot-gitlab-issue-973