Revert "Trimmed the branch to only the vs060 sub directory"

This reverts commit f02b7bab2124d4733fc7b232c275bad570d34681.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the vs060 sub directory