Merge branch 'ps/ci-gitlab'