Merge remote-tracking branch 'refs/remotes/origin/master' into dev

.gitlab-ci.yml not found in this commit