fix dir delete if not exited
Merge branches 'base-dir-del-fix' and '2.x' into 2.x