feature memory leak
feature memory leak: done
Commit 2 on feature memory leak