Merge changes I8580973e,Ic4455db1

* changes:
  Revert^4 "Prevent UAF issues caused by static destructors"
  Ensure that run-test preserves exit status