Merge pull request #2831 from pyhalov/7479