Configuration search values mege with 3.5

This was prepared from #1337