change log dir
Merge remote-tracking branch 'origin/tbdev2' into tbdev