Merge remote-tracking branch 'dgoulet/bug25901_032_01' into maint-0.3.2