[PBM-320] Commit retry