Merge "Restrict access to MetaData parceling functions"