Two missing detach cases.
Merge branch 'daniel_2073' into daniel_2073_debug