updates
Merge branch 'previewHotFix' into dev