added cherry-picks from rohan.elite