Merge pull request #4043 from ronie/PR3979