Conflict after cherry-pick fixed.