Merge pull request #9117 from colemanw/Tweak