display comments
merge poor display comments
Merge branch 'RemnevMaksim-dev' into dev