24599 - sync'd the prod and staging sw2 virtual store code
Merge pull request #364 from cannontech/staging

24599 - sync'd the prod and staging sw2 virtual store code