Replacement 14500 battery for Olight S15R

In mine I use UR14500P without PCB or NI14500A
No problem

The original charger died one year ago
Now I charge the batteries in an external charger, Opus 3100

It is both

https://files.dcpower.eu/datasheets/panasonic/UR14500P.pdf

Sanyo/Panasonic is the same