Merge pull request #6144 from Shulyaka/master