Merge remote-tracking branch 'dgoulet/ticket23303_032_01'