Merge pull request #8818 from TheIsotopes/patch-1