Rename property _commit to commit_mode and merge upstream changes