Merge pull request #1695 from gennadiycivil/master

 Formatting changes and upstreaming one test