Merge "fix: memory leak"