Merge remote-tracking branch 'origin/main' into pr-23

# Conflicts:
#	web/assets/app.js
#	web/assets/app.js.br
#	web/index.html.br
#	web/version.json
#	web/version.json.br