Merge "effects: fix a theoretical memory leak"