Re-enabling infinite scroll
Performance improvements
Performance enhancements