for bug
Merge branch 'next' into dev
for bug
disable log to faster tree loading
Merge branch 'next' into dev