todo: fix performance bug
performance bug fixed
Merge branch 'dev' into min
optimized last merge