Ashwin/Melanie | #3205 | Fixing web preview.