Added missing metadata fields to match.
Merge remote branch 'axsh-old/fix-missing-metadata-match' into wakame-edge