CFY-287 removed kv_store