Merge "Fix Rescue Party observability criteria"