Merge remote-tracking branch 'dgoulet/bug24895_029_02' into maint-0.2.9