Merge remote-tracking branch 'origin/memory-cleanup'