Merge pull request #2568 from tnull/2023-09-housekeeping