more speed improvements
Merge branch 'hotfix/1.1.13.8'