Merge remote-tracking branch 'upstream/dev' into dev

.gitlab-ci.yml not found in this commit