Merge "Fixed JSON output for Stagehand" into devel/master