r26212 - fix: ensure resources are closed by @midgleyc in

Top