This commit is a merge, and also the title change from Storefront to Clearinghouse.