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