Re-attemp landing of old commit: 7fe3586cda Co-authored-by: George Hu <georgehuyubo@gmail.com>
7fe3586cda
make_scope_exit