Latest health_manager changes