The horror ... the horror ...
Merge pull request #5695 from guardian/refactor-metadata

The horror ... the horror ...