Work in progress, reducing search cost
Revert "Work in progress, reducing search cost"

This reverts commit 8dbb8fac883df35369dbcc8d01eb4b4109a1cf52.
Merge remote-tracking branch 'origin/develop' into develop