Revert "Merge branch 'remove-cluster-health' into 'master'"

This reverts merge request !831 (merged) Suggesting recovering the logic and bring back cluster health.