Allow service providers to list events that cause them to load.
Fix conflicts and merge.