convert global class to a defined type
Merge branch 'convert_global_class_to_define'