Also fixes description of event source. (cherry picked from commit f6e8ba81) (cherry picked from commit 7ed7ea82)