Merge "Change bool, and string properties to *bool, and *string for cc"