Continuation of work on getting rid of cache usage by implementing new way of HypoTools merging
Tagging @tbold