Delay in 2.2.1 until we fix the usb issue