Merge pull request #3676 from Tarnyko/master