[FELIX-4656] Bring a deterministic behaviour to the resolver This would eventually allow introducing heuristics