Merge branch 'feat/zone-sync' into 'develop'

feat(fm): sync partner zones and clear ended subscriptions

See merge request !36