Merge pull request #1684 from gennadiycivil/master

Formatting changes, code sync