Merge "HealthCheckController up"