Also apply fixes and lay groundwork for eventual 'secure' discovery policy. As such a policy is too limited to be practical at this point (SMM only) the full deal is postponed until it would be feasible.