Update to master worthwhile. This speeds collection loading