This can't be cleanly cherry-picked due to a code organization change in events; #14083 needs to be remade targeting the 0.14 branch.