Merge pull request #1723 from gennadiycivil/master

code management comments,