Update for v4.
Add format key to source metadata.
Merge branch 'master' into carmen