[ENHANCEMENT] Bugfix/overlay memory leaks