Major performance improvements
This refs affinitic #6008