Merge branch 'rs/commit-commit-stack'

Code clean-up to use the commit_stack API. * rs/commit-commit-stack: commit: use commit_stack