Merge "Only report tryTest errors when not caught" into main