Merge "Fix performance regression."