Cherry pick for new interface