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

# Conflicts:
#	.github/workflows/gradle.yml