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