Merge pull request #1539 from tonyhffong/metadata-v2

Tag Lint v0.1.23