Merge branch 'improve-gitlab-ci' into 'develop'