Merge "Fix UUI health check"