Re #10031. Make it work with older versions of boost.
Merge branch 'feature/10031_integrate_FABADA' into develop