PLA-451 metadata handling changed