Merge "Only allow UTF8 encoded property values"