import fix to ITS#4665 (was erroneously marked as closed); the bug is almost fixed; the fix that's in HEAD is not eliminating one last leak, but I cannot spot where it's not catched