Merge branch 'sg/commit-cleanup-scissors'