Merge pull request #4431 from vkargov/vk-leaking-points