3 Hours Ago
Merge from fix_guid_null_primitive