Merge "Binder: Be forceful about a forceful exit." into oc-dev