(cherry picked from commit 1bd4a6e6)

Conflicts:
	.gitlab-ci.yml