Merge pull request #7085 from TomGijselinck/patch-1