mv-delete-mutex-fix from 2.0 branch