Merge pull request #1540 from tonyhffong/metadata-v2

Tag Lint v0.1.24