* speedup
Merge remote-tracking branch 'origin/0.8.1-stbx' into 0.8.1-stbx