Merge remote-tracking branch 'remotes/origin/main' into 2095-review-and-possibly-remove-unused-tables-2
