Merge branch 'sg/completion-commit-cleanup' into maint