Merge pull request #1469 from tonyhffong/metadata-v2

Tag Lint v0.1.20