Merge "Fix health check api"