Merge pull request #6817 from colemanw/positive