WIP: Resolve "Speedup subnet selection"

Francis Dupont requested to merge 554-speedup-subnet-selection-2 into master

Closes #554

Merge request reports