Minor performance tweak that gives about 5% more throughput.
Merge branch 'dev' into 1.5