Merge pull request #5923 from colemanw/Activity