Merge branch '6347-notifications-to-reseller-not-working' into 'develop'

Resolve "Notifications to reseller not working"

Closes #6347

See merge request !1610
1 job for develop in 8 seconds (queued for 3 seconds)