Merge pull request #2563 from tnull/2023-09-kvstore-followups