perf, memory: Improve performance and memory use for large datasets

perf, memory: Improve performance and memory use for large datasets #1235