Merge branch 'fix/zone-subscription' into 'main'

Add zone subscription endpoints and some extra fixes

See merge request !15