RUST-956 Include service_id
in relevant events
#469
+29
−2
Merged