Merge pull request #1674 from gennadiycivil/master

Code Sync