BasicType created with the className instead fieldTypeCode
Merge remote-tracking branch 'origin/master'