More job event tweaks
Merge branch 'refs/heads/notifications'