Merge "Change CodeType from enum to string (framework)"