Merge "close file stuffs  before deleted in teardown" into jb-dev