sync with upstream

.gitlab-ci.yml not found in this commit