Merge pull request #196 from SBS-team/773_comments_validation

773 comments validation
Merge branch 'dev' into 773_comments_validation