Merge remote-tracking branch 'dgoulet/ticket27410_032_01' into maint-0.3.3