updates for current master

.gitlab-ci.yml not found in this commit