Merge branch 'ks/commit-assuming-only-warning-removal'