cherry-picked last update