validation and logging chnages
Merge branch 'refs/heads/dev' into preview