fixed accidental perf degradation for short objects
Merge remote-tracking branch 'origin/master'