Merge commit '6f603acaaa3a1b0738bd7e9489f298f022974eea' into next-merge-partial Conflicts: autoconf/configure.ac configure tools/opt/Makefile