Merge branch 'optimize' into hotfix