Merge branch 'refix-typecode' into 'ibm-trunk'