Merge pull request #2472 from tnull/2023-08-add-kvstore