Merge pull request #4419 from BrzVlad/fix-oom-nre