Merge pull request #1713 from gennadiycivil/master

code management changes, no functionalty changes