Merge pull request #2061 from rzhxeo/var