BS-8678, fix xml import/export issue with custom field