Merge branch 'revert-try_compile-config-flags' into release