Merge pull request #21276 from ruchamahabal/patch-fix

fix: patch for Healthcare Refactoring