Merge "Add COMMUNAL_HUB flag" into main