Also cherry-pick the commit from Ozan