Remove stat block from secondary indexes.
Make get_distribution crash rather than work without a stat block.
Merge branch 'daniel_2431' into next