Merge remote-tracking branch 'epitron/metadata-pp'