Merge "Only invoke k/v helpers during k/v operations" into nyc-dev