Merge remote-tracking branch 'origin/stable' into stable

# Conflicts:
#	.github/workflows/build-and-push.yml
#	build.gradle