intermediate changes

ref:31bf0d71c0689bb2c7f3ddcc86dcb4b706765aa2

7 files changed, 86 insertions, 44 deletions

diff --git a/build/plugins/java.py b/build/plugins/java.py
index 7fd7d98e2e4..6dc4a72c730 100644
--- a/build/plugins/java.py
+++ b/build/plugins/java.py
@@ -47,7 +47,7 @@ def on_run_jbuild_program(unit, *args):
         unit.on_run_java(['TOOL'] + depends + ["OUT", fake_out])
 
     if not kv.get('CP_USE_COMMAND_FILE'):
-       args += ['CP_USE_COMMAND_FILE', unit.get(['JAVA_PROGRAM_CP_USE_COMMAND_FILE']) or 'yes']
+        args += ['CP_USE_COMMAND_FILE', unit.get(['JAVA_PROGRAM_CP_USE_COMMAND_FILE']) or 'yes']
 
     if fake_out is not None:
         args += ['FAKE_OUT', fake_out]
diff --git a/build/rules/autocheck.blacklist b/build/rules/autocheck.blacklist
index 04528d0f0be..45fb3749152 100644
--- a/build/rules/autocheck.blacklist
+++ b/build/rules/autocheck.blacklist
@@ -321,7 +321,6 @@ portal/xiva
 portal/documents
 taxi/lavka/platform/packages/aeroolib
 passport/infra/legacy/kannel
-afisha/infra/projects/deployer_cli
 passport/backend/passport_stress_fake_services
 data-ui/ydb-nodejs-sdk-benchmarks
 library/python/cia_stuff
@@ -351,7 +350,6 @@ taxi/github/e2e-playwright
 taxi/github/rnis-demo
 market/erp_axapta/libs/ADHelper
 intranet/tasha
-afisha/infra/projects/nyan
 market/erp_axapta/libs/ConsoleSitePinger
 taxi/lavka/platform/matcher/etl
 taxi/frontend/packages/react-ymaps
@@ -378,3 +376,25 @@ search-interfaces/turbo-services/turboext/ugc
 search-interfaces/turbo-services/turboext/css
 taxi/github/infra-tests-ui
 taxi/github/abu
+taxi/github/taxi-devops-data
+taxi/lavka/platform/packages/easytap
+taxi/lavka/platform/packages/dbtpl
+mds/admin/tools/telegram_bot
+hrtech/mobile
+search-interfaces/turbo-services/turboext/components
+data-ui/oko
+market/front/libs/jest-puppeteer-react
+taxi/lavka/platform/packages/easytaphttp
+market/front/libs/planning-helper
+search-interfaces/turbo-services/turbocss
+taxi/lavka/platform/packages/ymlcfg
+taxi/lavka/platform/packages/pgupgrade
+market/front/libs/Response
+data-ui/redux-unity-router
+mds/avatars/resizer-conf
+mds/admin/misc/gen-monitoring-panel
+mds/admin/packages/yandex-storage-yc-conf
+taxi/efficiencytest/crm_tests
+afisha/infra/projects/yandex-alet-docker-entrypoint
+classifieds/autoru-frontend-gdpr
+taxi/github/cargo-outsource
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 5d52a701e90..fea257c93d0 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -1,11 +1,11 @@
 # !!! DISCLAIMER! PLEASE DON'T IGNORE !!!
-# The FAKEID value is huge hammer. It affects UIDs of all nodes in build graph including, but not limnited to
+# The FAKEID value is huge hammer. It affects UIDs of all nodes in build graph including, but not limited to
 # any resource fetch (think java contrib), build on any language (C++, Python, Java, Go), any code generation.
 # Any build after this change will pay the price:
 # - Local builds and Sandbox builds will reload all resources from Sandbox and cached data from YT (if ready).
-# - Distributed (YT) cache warmup will take signigicant time to catch up and will need to recache everithing.
+# - Distributed (YT) cache warmup will take significant time to catch up and will need to recache everything.
 # - Autocheck will rebuild and recache everything.
-# Use this with extreme care and only change if it is utlimately needed. Consider more specific XXX_FAKEIDs below instead.
+# Use this with extreme care and only change if it is ultimately needed. Consider more specific XXX_FAKEIDs below instead.
 FAKEID=3141592653
 
 SANDBOX_FAKEID=${FAKEID}.7600000
@@ -177,7 +177,7 @@ otherwise {
     # This trigger doesn't work for module level since SYSINCL is processed at
     # configuration stage (This means that NO_RUNTIME() macro called in ya.make
     # won't affect SYSINCL and the only way to make this trigger work correctly
-    # is to define configuration varaible NORUNTIME (-DNORUNTIME) on the command
+    # is to define configuration variable NORUNTIME (-DNORUNTIME) on the command
     # line when `ya make ...` is invoked.
     when ($NORUNTIME != "yes") {
         SYSINCL+=build/sysincl/stl-to-libcxx.yml
@@ -396,7 +396,7 @@ when ($USE_SYSTEM_PYTHON) {
 
 ### @usage: NO_LTO()
 ###
-### Diasble any lto (link-time optimizations) for the module.
+### Disable any lto (link-time optimizations) for the module.
 ### This will compile module source files as usual (without LTO) but will not prevent lto-enabled
 ### linking of entire program if global settings say so.
 macro NO_LTO() {
@@ -480,9 +480,9 @@ CHECK_DEPENDENT_DIRS_RESTRICTIONS=
 ###  3. ALL: directory constraints following after this modifier are applied to both transitive PEERDIR dependencies and tool dependencies.
 ###  4. PEERDIRS: directory constraints following after this modifier are applied to transitive PEERDIR dependencies only.
 ###  5. GLOB: next directory constraint is an ANT glob pattern.
-###  6. EXCEPT: next constraint is an excption for the rest of other rules.
+###  6. EXCEPT: next constraint is an exception for the rest of other rules.
 ###
-### Direcory constraints added before either ALL or PEERDIRS modifier is used are treated as ALL directory constraints.
+### Directory constraints added before either ALL or PEERDIRS modifier is used are treated as ALL directory constraints.
 ###
 ### Note: Can be used multiple times on the same module all specified constraints will be checked.
 ### All macro invocation for the same module must use same constraints type (DENY or ALLOW_ONLY)
@@ -589,8 +589,8 @@ macro PROTO_ADDINCL(GLOBAL?"GLOBAL":"", Path, WITH_GEN?"BUILD":"") {
 ### Defines protobuf namespace (import/export path prefix) which should be used for imports and
 ### which defines output path for .proto generation.
 ###
-### For proper importing and configure-time depenedency management it sets ADDINCLs
-### for both .cpp headers includes and .proto imports. If .proto expected to be used outsed of the
+### For proper importing and configure-time dependency management it sets ADDINCLs
+### for both .cpp headers includes and .proto imports. If .proto expected to be used outside of the
 ### processing module use GLOBAL to send proper ADDINCLs to all (transitive) users. PEERDIR to
 ### PROTO_LIBRARY with PROTO_NAMESPACE(GLOBAL ) is enough at user side to correctly use the library.
 ### If generated .proto files are going to be used for building a module than use of WITH_GEN
@@ -855,7 +855,7 @@ macro _GO_PROTO_CMD(File) {
 # tag:proto
 ### @usage: YP_PROTO_YSON(Files... OUT_OPTS Opts...)
 ###
-### Genereate .yson.go from .proto using yp/go/yson/internal/proto-yson-gen/cmd/proto-yson-gen
+### Generate .yson.go from .proto using yp/go/yson/internal/proto-yson-gen/cmd/proto-yson-gen
 macro YP_PROTO_YSON(OUT_OPTS[], Files...) {
     .CMD=${cwd:BINDIR} $PROTOC --plugin=protoc-gen-custom=${tool:"yp/go/yson/internal/proto-yson-gen/cmd/proto-yson-gen"} -I=${ARCADIA_ROOT}/${PROTO_NAMESPACE} ${pre=-I=:_PROTO__INCLUDE} -I=${ARCADIA_ROOT} --custom_out="$OUT_OPTS paths=base_name:." --custom_opt="goroot=${GO_TOOLS_ROOT}" ${input:Files} ${output;hide;noauto;nopath;noext;suf=.yson.go:Files}
     .ADDINCL=FOR proto ${ARCADIA_ROOT}/${MODDIR} FOR proto ${ARCADIA_ROOT}/${GO_TEST_IMPORT_PATH} FOR proto yt ${ARCADIA_BUILD_ROOT}/yt FOR proto contrib/libs/protobuf/src
@@ -896,7 +896,7 @@ macro _CPP_PROTO_EVLOG_CMD(File) {
 
 # tag:proto
 macro _CPP_CFGPROTO_CMD(File) {
-    # keep extension in output just as in EV: this is hard-codeded behaviour of protoc for non-.proto extensions
+    # keep extension in output just as in EV: this is hard-coded behaviour of protoc for non-.proto extensions
     .CMD=$CPP_PROTO_CMDLINE  --plugin=protoc-gen-config=${tool:"library/cpp/proto_config/plugin"} --config_out=$ARCADIA_BUILD_ROOT/$PROTO_NAMESPACE $CPP_EV_OUTS ${kv;hide:"p PB"} ${kv;hide:"pc yellow"}
     .PEERDIR=library/cpp/proto_config/codegen library/cpp/proto_config/protos contrib/libs/protobuf
 }
@@ -1099,7 +1099,7 @@ macro _CPP_FLATC64_CMD(SRC, SRCFLAGS...) {
 ### @usage: _GO_FLATC_CMD(fbs_file flags...) # internal
 ###
 ### Create a tar archive of .go files generated by flatc for Go. Output tar archive
-### wiil have .fbs.gosrc extension. This .fbs.gosrc is specially processed when
+### will have .fbs.gosrc extension. This .fbs.gosrc is specially processed when
 ### --add-protobuf-result flag is specified on the command line for 'ya make ...'
 ### (tar archive is extracted to output directory).
 macro _GO_FLATC_CMD(SRC, PACKAGE_NAME) {
@@ -1562,7 +1562,7 @@ when ($SO_OUTPUTS == "yes") {
     LDFLAGS+=$RPATH_GLOBAL
 }
 
-# tag:restrinced tag:DLL
+# tag:restricted tag:DLL
 ### $usage: WITH_DYNAMIC_LIBS() # restricted
 ###
 ### Include dynamic libraries as extra PROGRAM/DLL outputs
@@ -1756,7 +1756,7 @@ module PY2_PROGRAM: _PY2_PROGRAM {
 ###
 ### Prevent module using in extended python source search.
 ### Use the macro if module contains python2-only files (or other python sources which shouldn't be imported by python3 interpreter)
-### which resides in the same directories with python 3 usefull code. contrib/python/future is a example.
+### which resides in the same directories with python 3 useful code. contrib/python/future is a example.
 ### Anyway, preferred way is to move such files into separate dir and don't use this macro at all.
 ###
 ### Also see: https://docs.yandex-team.ru/ya-make/manual/python/vars#y_python_extended_source_search for details
@@ -2700,7 +2700,7 @@ module DLL_UNIT: _LINK_UNIT {
         MODULE_SUFFIX=.so
     }
 
-    # This by now replicates ymake's bahavior. We'll get rid of SONAME setting in ymake and fix this code alltogether
+    # This by now replicates ymake's behavior. We'll get rid of SONAME setting in ymake and fix this code altogether
     SONAME=${pre=$MODULE_PREFIX;suf=$MODULE_SUFFIX:REALPRJNAME}
     when ($MODULE_VERSION) {
        LINK_DYN_LIB_FLAGS=--soname ${output;pre=$MODULE_PREFIX;suf=$MODULE_SUFFIX$MODULE_VERSION:REALPRJNAME}
@@ -2758,7 +2758,7 @@ module PY_ANY_MODULE: DLL_UNIT {
         }
     }
 
-    # This by now replicates ymake's bahavior. We'll get rid of SONAME setting in ymake and fix this code alltogether
+    # This by now replicates ymake's behavior. We'll get rid of SONAME setting in ymake and fix this code altogether
     SONAME=${pre=$MODULE_PREFIX;suf=$MODULE_SUFFIX:REALPRJNAME}
     when ($MODULE_VERSION) {
        LINK_DYN_LIB_FLAGS=--soname ${output;pre=$MODULE_PREFIX;suf=$MODULE_SUFFIX$MODULE_VERSION:REALPRJNAME}
@@ -2876,7 +2876,7 @@ macro DYNAMIC_LIBRARY_FROM(Path...) {
 
 ### @usage: DLL(name major_ver [minor_ver] [EXPORTS symlist_file] [PREFIX prefix])
 ###
-### Dynamic library module defintion.
+### Dynamic library module definition.
 ### 1. major_ver and minor_ver must be integers.
 ### 2. EXPORTS allows you to explicitly specify the list of exported functions. This accepts 2 kind of files: .exports with <lang symbol> pairs and JSON-line .symlist files
 ### 3. PREFIX allows you to change the prefix of the output file (default DLL has the prefix "lib").
@@ -2908,7 +2908,7 @@ module DLL_TOOL: DLL {
 
 ### @usage: SO_PROGRAM(name major_ver [minor_ver] [EXPORTS symlist_file] [PREFIX prefix])
 ###
-### Executable dynamic library module defintion.
+### Executable dynamic library module definition.
 ### 1. major_ver and minor_ver must be integers.
 ### 2. EXPORTS allows you to explicitly specify the list of exported functions. This accepts 2 kind of files: .exports with <lang symbol> pairs and JSON-line .symlist files
 ### 3. PREFIX allows you to change the prefix of the output file.
@@ -2975,7 +2975,7 @@ module DLL_PROXY: DEV_DLL_PROXY {
 ### or dependent DLL/DYNAMIC_LIBRARY.
 ###
 ### Note: this is temporary solution until support of `super-global` variables come
-###       which will enable transfer of some properies though final targets like DLLs.
+###       which will enable transfer of some properties though final targets like DLLs.
 macro DYNAMIC_DEPS(Path...) {
      # PEERDIR as macro completely ignored in place where this macro applies
      SET_APPEND(PEERDIR $Path)
@@ -2986,7 +2986,7 @@ macro DYNAMIC_DEPS(Path...) {
 ###
 ### The use of this module is strictly prohibited except LGPL-related opensourcing
 ### This provides linkable DLL module which brings its results to programs and tests
-### for seamless tesing and packaging
+### for seamless testing and packaging
 multimodule DYNAMIC_LIBRARY {
     module DLL_BIN: DLL {
         .PROXY=yes
@@ -3113,7 +3113,7 @@ TOUCH_GROUP=$TOUCH_PACKAGE ${kv;hide:"p CI"}
 ### @usage: CI_GROUP()
 ###
 ### Module collects what is described directly inside it transitively by PEERDIRs.
-### No particular layout of built artifacts is implied. This module is needed primarilly for CI dependency analysis and may not trigger builds at all.
+### No particular layout of built artifacts is implied. This module is needed primarily for CI dependency analysis and may not trigger builds at all.
 ###
 ### Is only used together with the macro PEERDIR() and FILES(). Don't use SRCS inside CI_GROUP().
 module CI_GROUP: _BARE_UNIT  {
@@ -3135,7 +3135,7 @@ TOUCH_UNIT_MF=$TOUCH_UNIT && $GENERATE_MF
 ### Enable include resolving within UNIONs and let system .proto being resolved
 ### among .proto/.gztproto imports
 ###
-### Note: it is currently impossible to enbale resolving only for .proto, so resolving is enabled for all supported files
+### Note: it is currently impossible to enable resolving only for .proto, so resolving is enabled for all supported files
 ### also we only add ADDINCL for stock protobuf. So use this macro with care: it may cause resolving problems those are
 ### to be addressed by either ADDINCLs or marking them as TEXT. Please contact devtools for details.
 macro RESOLVE_PROTO() {
@@ -3147,7 +3147,7 @@ macro RESOLVE_PROTO() {
 ###
 ### Collection of PEERDIR dependencies, files and artifacts.
 ### UNION doesn't build its peers, just provides those to modules depending on it.
-### When specied in DEPENDS() macro the UNION is transitively closed, building all its peers and providing those by own paths (without adding this module path like PACKAGE does).
+### When specified in DEPENDS() macro the UNION is transitively closed, building all its peers and providing those by own paths (without adding this module path like PACKAGE does).
 ###
 ### Is only used together with the macros like FILES(), PEERDIR(), COPY(), FROM_SANDBOX(), RUN_PROGRAM or BUNDLE(). Don't use SRCS inside a UNION.
 ###
@@ -3182,9 +3182,9 @@ module PY_PACKAGE: _PY_PACKAGE {
 }
 
 # tag:internal
-### @usage: _SET_FIRST_VALUE(name args...) # interanl
+### @usage: _SET_FIRST_VALUE(name args...) # internal
 ###
-### This macro sets the value of `name` vraiable to the value of next argument
+### This macro sets the value of `name` variable to the value of next argument
 macro _SET_FIRST_VALUE(NAME, VALUE, OTHER...) {
     SET($NAME $VALUE)
 }
@@ -3615,7 +3615,7 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
             KOTLINC_OPTS_VALUE+=-Xplugin=${KOTLIN_COMPILER_RESOURCE_GLOBAL}/plugins/kotlin-noarg-plugin.jar
         }
         # Must be in sync with KT_CLASSES_DIR!
-        # There are problems in JDK13 with abs paths in classapth baked into jar file manifest. Using relative path
+        # There are problems in JDK13 with abs paths in classpath baked into jar file manifest. Using relative path
         # here assumes that jar file with classpath for javac located in the $ARCADIA_BUILD_ROOT
         KT_CLASSPATH_ITEM=$MODDIR/kt_cls
     }
@@ -3637,7 +3637,7 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
         _LINK_UBERJAR=$_DO_LINK_UBERJAR
         PACK_JAR=$_PACK_JAR_HELPER(${BINDIR}/${REALPRJNAME}.lib.jar)
         # TODO: This condition is incorrect in case of autoinputs _UBERJAR_SELF should be empty only for
-        # modules without AUTO_INPUT and withuout JAVA_SRCS added inputs.
+        # modules without AUTO_INPUT and without JAVA_SRCS added inputs.
         when($ALL_JAR_SOURCES) {
             _UBERJAR_SELF=--jar ${BINDIR}/${REALPRJNAME}.lib.jar
         }
@@ -3725,7 +3725,7 @@ LINK_UBERJAR_PROGRAM=$YMAKE_PYTHON ${input:"build/scripts/make_java_classpath_fi
 
 # tag:java-specific
 RUN_WITH_SOURCES=no
-TARED_CLASSPATH=yes # TODO jbuild creates tar with all classpath deps by default and some projects rely on this. In ymake build this tar file creation is not needed and should be disabled by dafault in future
+TARED_CLASSPATH=yes # TODO jbuild creates tar with all classpath deps by default and some projects rely on this. In ymake build this tar file creation is not needed and should be disabled by default in future
 _JAR_SRCS_CALLED=no
 
 # tag:java-specific
@@ -4350,7 +4350,7 @@ macro USE_ERROR_PRONE() {
 TEST_CWD_VALUE=
 ### @usage: TEST_CWD(path)
 ###
-### Defines working directory for test runs. Othen used in conjunction with DATA() macro.
+### Defines working directory for test runs. Often used in conjunction with DATA() macro.
 ### Is only used inside of the TEST modules.
 ###
 ### Documentation: https://wiki.yandex-team.ru/yatool/test/
@@ -4401,7 +4401,7 @@ UBERJAR_HIDE_EXCLUDE_VALUE=
 UBERJAR_HIDE_EXCLUDE_FLAGS=
 ### @usage: UBERJAR_HIDE_EXCLUDE_PATTERN(Args...)
 ###
-### Exculude classes matching this patterns from shading (if enabled).
+### Exclude classes matching this patterns from shading (if enabled).
 ### Pattern may contain '*' and '**' globs.
 ### Shading is enabled for UBERJAR program using UBERJAR_HIDING_PREFIX macro. If this macro is not specified all classes are shaded.
 ###
@@ -4416,7 +4416,7 @@ UBERJAR_PATH_EXCLUDES=
 UBERJAR_PATH_EXCLUDE_VALUE=
 ### @usage: UBERJAR_PATH_EXCLUDE_PREFIX(Args...)
 ###
-### Exculude classes matching this patterns from UBERJAR.
+### Exclude classes matching this patterns from UBERJAR.
 ### By default all dependencies of UBERJAR program will lend in a .jar archive.
 ###
 ### @see: [UBERJAR](#macro_UBERJAR)
@@ -4628,7 +4628,7 @@ DEPENDENCY_MANAGEMENT_VALUE=
 ###
 ### Lock version of the library from the contrib/java at some point, so that all unversioned PEERDIRs to this library refer to the specified version.
 ###
-### For example, if the moduse has PEERDIR (contrib/java/junit/junit), and
+### For example, if the module has PEERDIR (contrib/java/junit/junit), and
 ###   1. specifies DEPENDENCY_MANAGEMENT(contrib/java/junit/junit/4.12),
 ###      the PEERDIR is automatically replaced by contrib/java/junit/junit/4.12;
 ###   2. doesn't specify DEPENDENCY_MANAGEMENT, PEERDIR automatically replaced
@@ -4799,9 +4799,9 @@ JAVA_CLASSPATH_CMD_TYPE_VALUE=
 
 # tag:java-specific
 ### @usage:TEST_JAVA_CLASSPATH_CMD_TYPE(Type)
-### Availible types: MANIFEST(default), COMMAND_FILE, LIST
+### Available types: MANIFEST(default), COMMAND_FILE, LIST
 ### Method for passing a classpath value to a java command line
-### MANIFEST via empty jar file with manifest that cantains Class-Path attribute
+### MANIFEST via empty jar file with manifest that contains Class-Path attribute
 ### COMMAND_FILE via @command_file
 ### LIST via flat args
 macro TEST_JAVA_CLASSPATH_CMD_TYPE(Type) {
@@ -5289,7 +5289,7 @@ macro _COPY_FILE_IMPL(FILE, AUTO_DST="", NOAUTO_DST="", OUTPUT_INCLUDES[]) {
 ### Parameters:
 ### - File - Source file name.
 ### - Destination - Output file name.
-### - AUTO - Consider copied file for further processing automtically.
+### - AUTO - Consider copied file for further processing automatically.
 ### - OUTPUT_INCLUDES output_includes... - Output file dependencies.
 ###
 ### The file will be just copied if AUTO boolean parameter is not specified. You should explicitly
@@ -5403,7 +5403,7 @@ macro SIZE(Type) {
 ###
 ### Join set of sources into single file named Out and send it for further processing.
 ### This macro doesn't place all file into Out, it emits #include<Src>... Use the for C++ source files only.
-### You should specify file name with the extension as Out. Futher processing will be done according this extension.
+### You should specify file name with the extension as Out. Further processing will be done according this extension.
 macro JOIN_SRCS(Out, Src...) {
     .CMD=$YMAKE_PYTHON ${input:"build/scripts/gen_join_srcs.py"} ${output:Out} --ya-start-command-file ${input;rootrel:Src} --ya-end-command-file ${output_include;hide:Src} ${kv;hide:"p JS"} ${kv;hide:"pc magenta"}
     .SEM=target_joined_source $Out ${input:Src} ${output;hide;suf=.o:Out}
@@ -5726,7 +5726,7 @@ macro _SRC("proto", SRC, SRCFLAGS...) {
 
 # tag:src-processing
 macro _SRC("gztproto", SRC, SRCFLAGS...) {
-    # _PROTO__INCLUDE is before ARCADIA_ROOT in includes because in gazetteer we don't use builtins now and paths'canonization (resolving) depends on order of roots.
+    # _PROTO__INCLUDE is before ARCADIA_ROOT in includes because in gazetteer we don't use builtins now and paths' canonization (resolving) depends on order of roots.
     # descriptor.proto must be resolved as google/protobuf/descriptor.proto
     .CMD=${tool:"dict/gazetteer/converter"} -I$PROTOBUF_PATH ${pre="-I":_PROTO__INCLUDE} -I$ARCADIA_ROOT ${SRCFLAGS} ${input:SRC} ${output;nopath;noext;norel:SRC.proto} ${kv;hide:"p GZ"} ${kv;hide:"pc yellow"}
     .PEERDIR=kernel/gazetteer/proto
@@ -8751,9 +8751,9 @@ macro ALL_PY_SRCS(TOP_LEVEL?"TOP_LEVEL":"", NAMESPACE="", RECURSIVE?"RECURSIVE":
 ### @usage: ALL_PYTEST_SRCS([RECURSIVE] [Dirs...])
 ###
 ### Puts all .py-files from given Dirs (relative to projects') into TEST_SRCS of the current module.
-### If Dirs is ommitted project directory is used
+### If Dirs is omitted project directory is used
 ###
-### `RECURSIVE` makes lookup recursive with resprect to Dirs
+### `RECURSIVE` makes lookup recursive with respect to Dirs
 ###
 ### Note: Only one such macro per module is allowed
 ### Note: Macro is designed to reject any ya.make files in Dirs except current one
diff --git a/cloud/bitbucket/private-api/yandex/cloud/priv/roles.yaml b/cloud/bitbucket/private-api/yandex/cloud/priv/roles.yaml
index bf4922add3e..fbb2897baf3 100644
--- a/cloud/bitbucket/private-api/yandex/cloud/priv/roles.yaml
+++ b/cloud/bitbucket/private-api/yandex/cloud/priv/roles.yaml
@@ -28,6 +28,7 @@ roles:
       - cic.partnerViewer
       - cic.secretViewer
       - cic.viewer
+      - cloudbeaver.viewer
       - compute.instanceGroups.viewer
       - compute.viewer
       - container-registry.viewer
@@ -92,6 +93,7 @@ roles:
       - cic.editor
       - cic.partnerEditor
       - cic.secretEditor
+      - cloudbeaver.editor
       - compute.editor
       - compute.instanceGroups.editor
       - compute.osLogin
@@ -155,6 +157,7 @@ roles:
       - billing.accounts.admin
       - cdn.admin
       - certificate-manager.admin
+      - cloudbeaver.admin
       - compute.admin
       - compute.osAdminLogin
       - container-registry.admin
@@ -253,6 +256,7 @@ roles:
       - certificate-manager.support
       - cic.support
       - cloudai.support
+      - cloudbeaver.support
       - cloudsearch.cloudsIndex.support
       - compute.instanceGroups.support
       - compute.support
@@ -298,6 +302,7 @@ roles:
       - certificate-manager.supportAdmin
       - cic.supportAdmin
       - cloudai.supportAdmin
+      - cloudbeaver.supportAdmin
       - compute.instanceGroups.supportAdmin
       - compute.supportAdmin
       - container-registry.supportAdmin
diff --git a/cloud/bitbucket/private-api/yandex/cloud/priv/serverless/functions/v1/inner/engine_service.proto b/cloud/bitbucket/private-api/yandex/cloud/priv/serverless/functions/v1/inner/engine_service.proto
index 8e8e30091e1..813dbc21a10 100644
--- a/cloud/bitbucket/private-api/yandex/cloud/priv/serverless/functions/v1/inner/engine_service.proto
+++ b/cloud/bitbucket/private-api/yandex/cloud/priv/serverless/functions/v1/inner/engine_service.proto
@@ -255,6 +255,8 @@ message EngineState {
     map<string, Artifact> artifacts = 3; // Key: ID (unique) = contracts.StorageReference.String()
     bool is_full_state = 4;
 
+    bool in_scalable_group = 23;
+
     reserved 10; // removed
     reserved 11; // removed
     Resources resources = 19;
diff --git a/cloud/bitbucket/private-api/yandex/cloud/priv/services.yaml b/cloud/bitbucket/private-api/yandex/cloud/priv/services.yaml
index 3ef399cba7f..ef7524a0b48 100644
--- a/cloud/bitbucket/private-api/yandex/cloud/priv/services.yaml
+++ b/cloud/bitbucket/private-api/yandex/cloud/priv/services.yaml
@@ -155,7 +155,7 @@ services:
   cloudsearch:
     name: YC.CloudSearch
     description: Сервис поиска по облакам
-  cloud-beaver:
+  cloudbeaver:
     name: CloudBeaver
     description: Управление базами данных через web-интерфейс
   smart-captcha:
@@ -167,7 +167,20 @@ services:
     name: DoubleCloud Network Service
     description: Управление сетями в DoubleCloud
 
-#Backoffice
+#Internal services
   backoffice:
     name: YC.Backoffice
     description: Внутренняя админка
+
+  maintenance:
+    name: Maintenance Service
+    description: Обслуживание облачных сервисов
+
+#Collaboration services
+  tracker:
+    name: Yandex Tracker
+    description: Яндекс Трекер, сервис для совместной работы и организации процессов в компании
+
+  wiki:
+    name: Yandex Wiki
+    description: Яндекс Вики, сервис для ведения базы знаний
diff --git a/cloud/bitbucket/private-api/yandex/cloud/priv/stages.yaml b/cloud/bitbucket/private-api/yandex/cloud/priv/stages.yaml
index c54ac60a30e..4aed116cf7b 100644
--- a/cloud/bitbucket/private-api/yandex/cloud/priv/stages.yaml
+++ b/cloud/bitbucket/private-api/yandex/cloud/priv/stages.yaml
@@ -102,6 +102,8 @@ stages:
   - DATA_TRANSFER_YC_FROM_LOGBROKER #https://st.yandex-team.ru/TM-2563
   - DATA_TRANSFER_YC_TO_LOGBROKER #https://st.yandex-team.ru/TM-2563
   - DATA_TRANSFER_AIRBYTE #https://st.yandex-team.ru/TM-2899
+  - DATA_TRANSFER_GREENPLUM # https://st.yandex-team.ru/TM-3280
+  - DATA_TRANSFER_DEBEZIUM # https://st.yandex-team.ru/TM-3218
   - DATASPHERE_GENERAL_NIRVANA_GRAPHS # https://st.yandex-team.ru/CLOUD-62288
   - DATASPHERE_CELL_DEPLOYMENT
   - IAM_FOLDER_SAML_FEDERATIONS # iam SAML-federations in folder https://st.yandex-team.ru/CLOUD-69157