Merge branch 'sb/leaks'