Merge remote-tracking branch 'remotes/philmd/tags/gitlab-ci-20210527' into staging