stagehand PR review changes
Merge pull request #3618 from devoncarew/devoncarew_stagehand_review

stagehand PR review changes