Resolved conflict after cherry pick