Send scenario modules only once
Merge branch 'send-scenario-only-once' into ntp-sync