Merge branch 'master' into simplify-docker-push

# Conflicts:
#	.github/workflows/release-docker.yml