diff --git a/programs/ya.make b/programs/ya.make
index 2de3052f1d2..66a0b076442 100644
--- a/programs/ya.make
+++ b/programs/ya.make
@@ -23,6 +23,7 @@ SRCS(
     client/QueryFuzzer.cpp
     client/ConnectionParameters.cpp
     client/Suggest.cpp
+    client/TestHint.cpp
     extract-from-config/ExtractFromConfig.cpp
     server/Server.cpp
     server/MetricsTransmitter.cpp
diff --git a/src/Backups/ya.make b/src/Backups/ya.make
new file mode 100644
index 00000000000..96217a56ef0
--- /dev/null
+++ b/src/Backups/ya.make
@@ -0,0 +1,27 @@
+# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
+OWNER(g:clickhouse)
+
+LIBRARY()
+
+PEERDIR(
+    clickhouse/src/Common
+)
+
+
+SRCS(
+    BackupEntryConcat.cpp
+    BackupEntryFromAppendOnlyFile.cpp
+    BackupEntryFromImmutableFile.cpp
+    BackupEntryFromMemory.cpp
+    BackupEntryFromSmallFile.cpp
+    BackupFactory.cpp
+    BackupInDirectory.cpp
+    BackupRenamingConfig.cpp
+    BackupSettings.cpp
+    BackupUtils.cpp
+    hasCompatibleDataToRestoreTable.cpp
+    renameInCreateQuery.cpp
+
+)
+
+END()
diff --git a/src/Backups/ya.make.in b/src/Backups/ya.make.in
new file mode 100644
index 00000000000..7d91972194d
--- /dev/null
+++ b/src/Backups/ya.make.in
@@ -0,0 +1,14 @@
+OWNER(g:clickhouse)
+
+LIBRARY()
+
+PEERDIR(
+    clickhouse/src/Common
+)
+
+
+SRCS(
+<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -F fuzzers | sed 's/^\.\//    /' | sort ?>
+)
+
+END()
diff --git a/src/Interpreters/Session.cpp b/src/Interpreters/Session.cpp
index 58a0407be00..4d41ba21026 100644
--- a/src/Interpreters/Session.cpp
+++ b/src/Interpreters/Session.cpp
@@ -288,7 +288,7 @@ void Session::authenticate(const Credentials & credentials_, const Poco::Net::So
 #if defined(ARCADIA_BUILD)
     /// This is harmful field that is used only in foreign "Arcadia" build.
     if (const auto * basic_credentials = dynamic_cast<const BasicCredentials *>(&credentials_))
-        session_client_info->current_password = basic_credentials->getPassword();
+        prepared_client_info->current_password = basic_credentials->getPassword();
 #endif
 }
 
diff --git a/src/ya.make b/src/ya.make
index 6537f67d66f..fb6f077502b 100644
--- a/src/ya.make
+++ b/src/ya.make
@@ -5,6 +5,7 @@ LIBRARY()
 PEERDIR(
     clickhouse/src/Access
     clickhouse/src/AggregateFunctions
+    clickhouse/src/Backups
     clickhouse/src/Bridge
     clickhouse/src/Client
     clickhouse/src/Columns