Only return healthy instances.
Merge backwards from master; one hotfix.