Merge remote-tracking branch 'refs/remotes/template/forks/polyipseity'

# Conflicts:
#	package-lock.json
#	package.json
#	pnpm-lock.yaml

Author: polyipseity