v1.1 metadata mapping updates
Merge remote-tracking branch 'upstream/metadata-v-1.1' into gh-pages