BUG-7033: Fix commit exception due to pipe-lining