SWC-377 and SWC-378 - Governance and ToU changes