HSEARCH-1296

Not for merging!

Still not perfect and some tests not happy with this change:

Preview for @Alesj