Merge branch 'dev'

.gitlab-ci.yml not found in this commit