recompiled OIS with /Z7
Merge remote-tracking branch 'origin/gd425' into partitioning