Merge pull request #23333 from ruchamahabal/enrollment-fixes

fix: Program and Course Enrollment fixes