Catalog Affiliate and Common controllers update

Catalog Affiliate and Common controllers update