Merge pull request #7190 from galgeek/patch-1