Merge "[HOLMES] Fixed the healthcheck failure"