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

Refix typecode

See merge request !64