Merge branch 'master' into rocksdb-explicit-dir-file-grant

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>