Re #10031. Fix for normal distribution on rhel6.
Merge branch 'feature/10031_integrate_FABADA' into develop