Merge branch 'net-driver-autoload'