Merge "Use proper ScriptCall size in nScriptForEach()" into nyc-dev