MRM-1486 prevent truncation of properties with commas

See MRM-1486 for details.