Get rid of comments test cases (move to another feature branch)
Merge branch 'dev' into stage
Get rid of comments tests cases (move to another feature branch)