screenshotPreview added
screnshot validation added
Merge branch 'develop' into feature/screenshot

Merge with develop