Service events to preprod

Bring recent staging changes into preprod, most notably the Events from @velveteer