Fix/preview

Merged Julien Wadel requested to merge fix/preview into master

Merge request reports