Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	.gitlab-ci.yml
#	CHANGELOG.md
#	README.md
#	templates/gitlab-ci-docker-ecr.yml
#	templates/gitlab-ci-docker-gcp.yml
#	templates/gitlab-ci-docker-vault.yml
#	templates/gitlab-ci-docker.yml