Metadata should be empty dict, not None
Merge branch 'bald-eagle'