Merge branch 'main' into '12-add-a-sandbox-mode-for-experimentation'

# Conflicts:
#   doc/configuration.md
#   plugins/docker-integration.php