Merge pull request #2299 from lewurm/finalizer_thread