Merge "Fix "Resource leak: <Foo> is never closed""