Merge pull request #3289 from BrzVlad/fix-critical-finalizer