FIX Arguments to method calls reseting scope
Merge pull request #2150 from hafriedlander/fix/templatevars-v2

FIX Arguments to method calls reseting scope