Imroved lifespan handling for reservoirs
p4#: 20526