Events controller.
Merge upstream.