performance improvement
release id ea64042d5d
Merge remote-tracking branch 'origin/master' into 1.4.5