Merge branch 'small-jsonld-refactor' into 'develop'