Merge pull request #1456 from tonyhffong/metadata-v2

Tag Lint v0.1.15