cherry-pick -> call(this, 118a4a8a20c4eed58c61601435e5e73ee774e9cf)