Cherry picked patches for vSphere users. All should be upstreamed. Not all are ready to be sent upstream.