Fix bug in TempFileMgr startup
Merge remote-tracking branch 'UMS/master'