Merge "Allow VS to run derive_classpath"