satellite events
Merge branch 'cyril-preprod' into preprod
fix fail merge 2
fix fail merge 3