This is obviously not enough. There is a memory leak caused by 348487cb28e66b032bae1b38424d81bf5b444408. The stable branch now has reverts of both commits.