Fix: Bad vars
Merge remote-tracking branch 'Upstream/3.7' into 1678