@taldcroft - I'm a little confused here - in the code you originally wrote, you first call ``metadata.merge``, but then it looks like you are just going over it again and doing it explicitly. Is the code in the ``fot attr in attrs`` actually needed, or can it be removed since ``metadata.merge`` should be sufficient?