Issue #15819: Merge include search from 3.5 into 3.6