Merge pull request #3204 from BrzVlad/fix-lock-free-alloc2