fixed bug in feature preview
Merge branch 'master' into develop