Update the solution file #30
Merge branch 'vc_upgrade'