Merge "Prevent UAF issues caused by static destructors"