BUG-8056: make doCommit/finishCommit package-private