Fixed: Wrong variable declaration (scope)
Typo
Merge remote-tracking branch 'upstream/master' into upstream-master