Merge pull request #21509 from ruchamahabal/fix-healthcare-v13-beta

fix: Healthcare Fixes