Fixes #8433 - Fix type transformation for all ENC-able NICs