Merge pull request #29151 from ChillarAnand/remove-nonprofit