BZ-12920: Fix issue with previewlink
Merge branch 'Sprint74-DV' into release-candidate