Merge "Update sanitize property format"