Pseudopotential psp8 and psp6

Dear Abinit Users,

I am new to Abinit. And I am trying to use Abinit pseudopotentials (psp8 and psp6). I have questions about some of the formulations.

In this page,

In formula (2) for psp8, there is a $1/r$ factor. Is this supposed to be in the formula when loading the psedupotential to a real-space grid? If so, how do you deal with the point as $r$ approaches zero?

And for psp6, after writing the KB form as in formula (1) in the page, will there be a $1/r$ factor when loading the pseudopotential to a real-space grid?

I am a little confused as I have been reading several lecture notes online. Please help me clarify. Thank you very much.