Merge changes I9ddd1ac8,I0848708d into main

* changes:
  Add COMMUNAL_HUB feature flag
  Rename flag to COMMUNAL_SERVICE_ENABLED