Feature/734 health check tweaks