Merge pull request #7078 from colemanw/qs