Merge pull request #6528 from colemanw/Common