Merge "Fix vFW Distrobution"