Merge pull request from ambulatoryoss/analysis-Xlp35J Apply fixes from StyleCI