Merge pull request from reliqui/analysis-zEwPBy Apply fixes from StyleCI