Merge pull request #8246 from dstftw/initial-json-ld-metadata-support