Merge pull request #8182 from atomic83/patch-1