Cherry-pick 11Batch.
Fix 11Batch vs 2013 build.