Merge pull request #4706 from pkulak/master