[Maria-developers] Review of last part of discover code