[FIX] minor optimization
Merge remote-tracking branch 'origin/dev' into HEAD