Merged code of Infrastructure from VS2010 to VS2012