Merge "[KV] Refactor logs"