Merge pull request #2934 from vargaz/fix-36852