* commit '1d8152726b7ef2094f2e99619581c2abd2117381': Reduce risk of memory corruption due to finalization.