Integrate updates from ODE 1.3.6 benchmark