diff --git a/cmake/find_execinfo.cmake b/cmake/find_execinfo.cmake
index 650d279983c..85cc5cf951a 100644
--- a/cmake/find_execinfo.cmake
+++ b/cmake/find_execinfo.cmake
@@ -1,9 +1,8 @@
 if (OS_FREEBSD)
     find_library (EXECINFO_LIBRARY execinfo)
     find_library (ELF_LIBRARY elf)
-    message (STATUS "Using execinfo: ${EXECINFO_LIBRARY}")
-    message (STATUS "Using elf: ${ELF_LIBRARY}")
+    set (EXECINFO_LIBRARIES ${EXECINFO_LIBRARY} ${ELF_LIBRARY})
+    message (STATUS "Using execinfo: ${EXECINFO_LIBRARIES}")
 else ()
-    set (EXECINFO_LIBRARY "")
-    set (ELF_LIBRARY "")
+    set (EXECINFO_LIBRARIES "")
 endif ()
diff --git a/dbms/CMakeLists.txt b/dbms/CMakeLists.txt
index 2c9bfa48605..63e97f4e061 100644
--- a/dbms/CMakeLists.txt
+++ b/dbms/CMakeLists.txt
@@ -194,8 +194,7 @@ target_link_libraries (clickhouse_common_io
     ${CITYHASH_LIBRARIES}
         PRIVATE
     ${ZLIB_LIBRARIES}
-    ${EXECINFO_LIBRARY}
-    ${ELF_LIBRARY}
+    ${EXECINFO_LIBRARIES}
         PUBLIC
     ${Boost_SYSTEM_LIBRARY}
         PRIVATE
diff --git a/dbms/programs/clang/Compiler-5.0.0/CMakeLists.txt b/dbms/programs/clang/Compiler-5.0.0/CMakeLists.txt
index 7fe0cd92ef7..e0171630bf2 100644
--- a/dbms/programs/clang/Compiler-5.0.0/CMakeLists.txt
+++ b/dbms/programs/clang/Compiler-5.0.0/CMakeLists.txt
@@ -46,7 +46,7 @@ LLVMSupport
 #PollyISL
 #PollyPPCG
 
-PUBLIC ${ZLIB_LIBRARIES} ${EXECINFO_LIBRARY} Threads::Threads
+PUBLIC ${ZLIB_LIBRARIES} ${EXECINFO_LIBRARIES} Threads::Threads
 ${MALLOC_LIBRARIES}
 ${GLIBC_COMPATIBILITY_LIBRARIES}
 ${MEMCPY_LIBRARIES}
diff --git a/dbms/programs/clang/Compiler-6.0.0/CMakeLists.txt b/dbms/programs/clang/Compiler-6.0.0/CMakeLists.txt
index b96bdb0647a..bac622ab09e 100644
--- a/dbms/programs/clang/Compiler-6.0.0/CMakeLists.txt
+++ b/dbms/programs/clang/Compiler-6.0.0/CMakeLists.txt
@@ -46,7 +46,7 @@ ${REQUIRED_LLVM_LIBRARIES}
 #PollyISL
 #PollyPPCG
 
-PUBLIC ${ZLIB_LIBRARIES} ${EXECINFO_LIBRARY} Threads::Threads
+PUBLIC ${ZLIB_LIBRARIES} ${EXECINFO_LIBRARIES} Threads::Threads
 ${MALLOC_LIBRARIES}
 ${GLIBC_COMPATIBILITY_LIBRARIES}
 ${MEMCPY_LIBRARIES}
diff --git a/dbms/programs/clang/Compiler-7.0.0/CMakeLists.txt b/dbms/programs/clang/Compiler-7.0.0/CMakeLists.txt
index 8b6ba6be994..35e23cc6b46 100644
--- a/dbms/programs/clang/Compiler-7.0.0/CMakeLists.txt
+++ b/dbms/programs/clang/Compiler-7.0.0/CMakeLists.txt
@@ -42,7 +42,7 @@ lldCore
 
 ${REQUIRED_LLVM_LIBRARIES}
 
-PUBLIC ${ZLIB_LIBRARIES} ${EXECINFO_LIBRARY} Threads::Threads
+PUBLIC ${ZLIB_LIBRARIES} ${EXECINFO_LIBRARIES} Threads::Threads
 ${MALLOC_LIBRARIES}
 ${GLIBC_COMPATIBILITY_LIBRARIES}
 ${MEMCPY_LIBRARIES}
diff --git a/dbms/programs/clang/Compiler-7.0.0bundled/CMakeLists.txt b/dbms/programs/clang/Compiler-7.0.0bundled/CMakeLists.txt
index d0ccc8d672c..d03052ffc28 100644
--- a/dbms/programs/clang/Compiler-7.0.0bundled/CMakeLists.txt
+++ b/dbms/programs/clang/Compiler-7.0.0bundled/CMakeLists.txt
@@ -42,7 +42,7 @@ lldCore
 
 ${REQUIRED_LLVM_LIBRARIES}
 
-PUBLIC ${ZLIB_LIBRARIES} ${EXECINFO_LIBRARY} Threads::Threads
+PUBLIC ${ZLIB_LIBRARIES} ${EXECINFO_LIBRARIES} Threads::Threads
 ${MALLOC_LIBRARIES}
 ${GLIBC_COMPATIBILITY_LIBRARIES}
 ${MEMCPY_LIBRARIES}
diff --git a/dbms/tests/clickhouse-test b/dbms/tests/clickhouse-test
index f1819d12d9a..7612c415373 100755
--- a/dbms/tests/clickhouse-test
+++ b/dbms/tests/clickhouse-test
@@ -116,6 +116,7 @@ exit_code = 0
 #def run_tests_array(all_tests, suite, suite_dir, suite_tmp_dir, run_total):
 def run_tests_array(all_tests_with_params):
     all_tests, suite, suite_dir, suite_tmp_dir, run_total = all_tests_with_params
+    global exit_code
     global SERVER_DIED
 
     OP_SQUARE_BRACKET = colored("[", args, attrs=['bold'])
@@ -393,7 +394,7 @@ def main(args):
         suite = suite_re_obj.group(1)
         if os.path.isdir(suite_dir):
 
-            if 'stateful' in suite and not is_data_present():
+            if 'stateful' in suite and not args.no_stateful and not is_data_present():
                 print("Won't run stateful tests because test data wasn't loaded.")
                 continue
             if 'stateless' in suite and args.no_stateless:
diff --git a/libs/libcommon/CMakeLists.txt b/libs/libcommon/CMakeLists.txt
index 999290996a9..02199c21a4f 100644
--- a/libs/libcommon/CMakeLists.txt
+++ b/libs/libcommon/CMakeLists.txt
@@ -91,9 +91,13 @@ target_include_directories (common BEFORE PRIVATE ${CCTZ_INCLUDE_DIR})
 target_include_directories (common PUBLIC ${COMMON_INCLUDE_DIR})
 
 if (NOT USE_INTERNAL_BOOST_LIBRARY)
-    target_include_directories (common BEFORE PUBLIC ${Boost_INCLUDE_DIRS})
+    target_include_directories (common SYSTEM BEFORE PUBLIC ${Boost_INCLUDE_DIRS})
 endif ()
 
+if(NOT USE_INTERNAL_POCO_LIBRARY)
+    target_include_directories (common SYSTEM BEFORE PUBLIC ${Poco_Foundation_INCLUDE_DIR})
+endif()
+
 target_link_libraries (common
         PUBLIC
     ${Poco_Foundation_LIBRARY}
diff --git a/libs/libdaemon/CMakeLists.txt b/libs/libdaemon/CMakeLists.txt
index eb73f1cda33..181030009b0 100644
--- a/libs/libdaemon/CMakeLists.txt
+++ b/libs/libdaemon/CMakeLists.txt
@@ -22,4 +22,4 @@ endif ()
 
 target_include_directories (daemon PUBLIC include)
 
-target_link_libraries (daemon PRIVATE clickhouse_common_io clickhouse_common_config common ${Poco_Net_LIBRARY} ${Poco_Util_LIBRARY} ${EXECINFO_LIBRARY} ${ELF_LIBRARY})
+target_link_libraries (daemon PRIVATE clickhouse_common_io clickhouse_common_config common ${Poco_Net_LIBRARY} ${Poco_Util_LIBRARY} ${EXECINFO_LIBRARIES})
diff --git a/libs/libmysqlxx/cmake/find_mysqlclient.cmake b/libs/libmysqlxx/cmake/find_mysqlclient.cmake
index 71cb2bfeb1d..98b42a0a9b4 100644
--- a/libs/libmysqlxx/cmake/find_mysqlclient.cmake
+++ b/libs/libmysqlxx/cmake/find_mysqlclient.cmake
@@ -1,17 +1,17 @@
-option (ENABLE_MYSQL "Enable MySQL" ${OS_LINUX})
-if (OS_LINUX)
-    option (USE_INTERNAL_MYSQL_LIBRARY "Set to FALSE to use system mysqlclient library instead of bundled" ${NOT_UNBUNDLED})
-else ()
-    option (USE_INTERNAL_MYSQL_LIBRARY "Set to FALSE to use system mysqlclient library instead of bundled" OFF)
-endif ()
+option(ENABLE_MYSQL "Enable MySQL" 1)
+if(ENABLE_MYSQL)
+    if(OS_LINUX)
+        option(USE_INTERNAL_MYSQL_LIBRARY "Set to FALSE to use system mysqlclient library instead of bundled" ${NOT_UNBUNDLED})
+    else()
+        option(USE_INTERNAL_MYSQL_LIBRARY "Set to FALSE to use system mysqlclient library instead of bundled" OFF)
+    endif()
 
-if (USE_INTERNAL_MYSQL_LIBRARY AND NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/mariadb-connector-c/README.md")
-    message (WARNING "submodule contrib/mariadb-connector-c is missing. to fix try run: \n git submodule update --init --recursive")
-   set (USE_INTERNAL_MYSQL_LIBRARY 0)
-endif ()
+    if(USE_INTERNAL_MYSQL_LIBRARY AND NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/mariadb-connector-c/README.md")
+        message(WARNING "submodule contrib/mariadb-connector-c is missing. to fix try run: \n git submodule update --init --recursive")
+        set(USE_INTERNAL_MYSQL_LIBRARY 0)
+    endif()
 
 
-if (ENABLE_MYSQL)
     if (USE_INTERNAL_MYSQL_LIBRARY)
         set (MYSQLCLIENT_LIBRARIES mysqlclient)
         set (USE_MYSQL 1)