Merge pull request #1741 from gennadiycivil/master

Comments changes, no functionality changes.