Fixed show previews
Merge branch 'develop'