Merge pull request #337 from jay-hodgson/develop

SWC-248: Generate appropriate previews for all leaf entities
Merge pull request #340 from jay-hodgson/release-1.21

cherry-pick SWC-248 for release branch