Merge "allow external USB host management"