WIP: migrate to dervied conditions in FT hit storing algorithms avoiding potential memory leaks

This MR follows a discussion here. It tries to prevent a memory leak by using dervied conditions and cleans up a bit.

Waits for !1815 (merged) to be merged.

It also puts in updated resolutions from !1829 (merged).

Might need a reference update because of removed info message.