Merge pull request #1740 from gennadiycivil/master

Comments changes, no functionality changes