[#4427]able to disable both consumer and provider zone-aware (#4430)

[#4427]able to disable both consumer and provider zone-aware (#4430) #3211