Cherry-pick on-enter-commit changes.