Merge "Updating Test Harness to show wait channel" into devel/master