Merge "Fix a performance regression"