Merge "Fixes for __cxa_finalize"