Tweak logging
Merge branch 'master' into event-notifications