WIP: Backport KVStore changes
#159
+178
−180
Closed
KVStore changes
#159