Just bought two more Li-ion batteries from Amazon to suit my growing range of Ryobi One+ power tools. These are not genuine Ryobi batteries but are fully compatible with them if my experience with a previously-purchased compatible battery pack is a rteliable indication.
The will replace the old & tired Ni-Cad batteries that originally came with the hammer drill 15 years ago.