Merge remote-tracking branch 'dgoulet/bug20629_030_01'