EMAILPLT-133 Bundle new version of email preview
Merge remote-tracking branch 'upstream/rel-4-0-patches' into rel-4-0-patches