this oughta speed things up.
Merge branch 'hotfix/6.6.4'