Merge pull request #23714 from ruchamahabal/education-module-fixes

fix: Education Module fixes