Update scope_exit from develop.