Sync src/configure with upstream and patch from #615691