Development of advanced rechargeable Ni/MH and Ni/Zn batteries