Improve performance
Merge branch 'shayne'