Also fixes description of event source. (cherry picked from commit f6e8ba81)
mentioned in commit 795e1d57