speed improvement
Merge branch 'hotfix/speed_1'