BUG-8620: handle direct commit and disconnect correctly