Merge "fix 2 missing "local var" JavaScript statements"