Attach device with proper prefix
Extend instance timeout for VMware case.
Merge remote-tracking branch 'origin/testing' into testing