MB3 Metadata

Squashed and rebased...