Backport of "discoverer: chain up to parent finalize methods in all our types" into 1.20
Backport of !1984 (merged) "discoverer: chain up to parent finalize methods in all our types".
Commits:
- 203e34fb discoverer: chain up to parent finalize methods in all our types