Merge "Revert "Revert^4 "Prevent UAF issues caused by static destructors"""