Merge "Modifying MetaData invalidates previous char*" into nyc-dev