Merge pull request #26085 from anupamvs/lead-cleanup

refactor: lead