Merge branch 'omit-nondiscoverable-from-search' into 'develop'