2 Months Ago
merge from fix_guid_null_error