Merge branch 'ld/discovery-limit-to-fs' (early part)