SUP-1287,FEC-586,PLAT-664

Fix Preview & Embed