Re #10031. Throw exception if not converged.
Merge branch 'feature/10031_integrate_FABADA' into develop