Merge "Fix list of type_drivers for ML2 plugin"