Merge "Fix storaged memory leak"