Merge remote branch 'jean-sebastien/fix-test-icode' into next