Code

Merge branch 'tm/completion-commit-fixup-squash'