Merge pull request #1564 from am11/master

Code: Analysis fixes and formattings
Release: v2.3.5.