Merge pull request #6694 from Quix0r/rewrites/added-missing-var-init