Merge pull request #2706 from colemanw/act