Merge pull request #4869 from apatrushev/master