Re #10031. Fixing the unit test.
Merge branch 'feature/10031_integrate_FABADA' into develop