Change CIC Code to Use Code
Merge changes
Change CIC Code to Use Code (everywhere)