4.1 backport

.gitlab-ci.yml not found in this commit