Merge remote-tracking branch 'origin/b24'

# Conflicts:
#	.env.example
#	CHANGELOG.md
#	Makefile
#	composer.lock
#	docker/apache/Dockerfile
#	docker/php/Dockerfile
#	docker/php/fpm.conf
#	docker/php/php.dev.ini
#	docker/php/php.ini
#	docker/php/php.prod.ini
#	docker/test/php.conf
#	package-lock.json
#	package.json
#	vite.config.mjs