cherry-picks from Neo