0.15.4: Many improvements to index building