Merge pull request #25059 from ruchamahabal/non-profit-fixes

fix: Non Profit fixes