fix, and the statement journal spill delay enhancement from trunk. FossilOrigin-Name: 17fd8f3cf0ec565e08403dc8e10a1cffc2bbe165