Hsearch 882 final


Freshly rebased, needs to be applied of the IndexManager contract changes to compile