Restoring authorship annotation for <svidyuk@yandex-team.ru>. Commit 1 of 2.

39 files changed, 2189 insertions, 2189 deletions

diff --git a/build/conf/java.ymake.conf b/build/conf/java.ymake.conf
index ed85153c78..9a95c6a44b 100644
--- a/build/conf/java.ymake.conf
+++ b/build/conf/java.ymake.conf
@@ -1,179 +1,179 @@
-YMAKE_JAVA_MODULES=yes
-JBUILD_JAVA_MODULES=no
-
-macro _INPUT_WITH_FLAG(Flag, IN[]) {
-    .CMD=$_INPUT_WITH_FLAG_IMPL(${pre=$Flag :IN} IN $IN)
-}
-
-macro _INPUT_WITH_FLAG_IMPL(IN{input}[], Args...) {
-    .CMD=$Args ${input;hide:IN}
-}
-
-macro ACCELEO(XSD{input}[], MTL{input}[], MTL_ROOT="${MODDIR}", LANG{input}[], OUT{output}[], OUT_NOAUTO{output}[], OUTPUT_INCLUDES[], DEBUG?"stdout2stderr":"stderr2stdout") {
+YMAKE_JAVA_MODULES=yes 
+JBUILD_JAVA_MODULES=no 
+ 
+macro _INPUT_WITH_FLAG(Flag, IN[]) { 
+    .CMD=$_INPUT_WITH_FLAG_IMPL(${pre=$Flag :IN} IN $IN) 
+} 
+ 
+macro _INPUT_WITH_FLAG_IMPL(IN{input}[], Args...) { 
+    .CMD=$Args ${input;hide:IN} 
+} 
+ 
+macro ACCELEO(XSD{input}[], MTL{input}[], MTL_ROOT="${MODDIR}", LANG{input}[], OUT{output}[], OUT_NOAUTO{output}[], OUTPUT_INCLUDES[], DEBUG?"stdout2stderr":"stderr2stdout") { 
     .PEERDIR=build/platform/java/jdk $JDK_RESOURCE_PEERDIR
-    .CMD=${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON ${input;pre=build/scripts/:DEBUG.py} $JDK_RESOURCE/bin/java -Dfile.encoding=utf8 -classpath ${RUN_JAR_PROG_CP_PRE}${tool:"tools/acceleo"}${RUN_JAR_PROG_CP_SUF} ru.yandex.se.logsng.tool.Cli $_INPUT_WITH_FLAG(--xsd IN $XSD) $_INPUT_WITH_FLAG(--mtl IN $MTL) $_INPUT_WITH_FLAG(--lang IN $LANG) --output-dir $BINDIR --build-root ${ARCADIA_BUILD_ROOT} --source-root ${ARCADIA_ROOT}  --mtl-root $MTL_ROOT ${output_include;hide:OUTPUT_INCLUDES} ${output;hide:OUT} ${output;noauto;hide:OUT_NOAUTO} ${kv;hide:"p JV"} ${kv;hide:"pc light-blue"} ${kv;hide:"show_out"}
-}
-
-### @usage: JAVA_LIBRARY()
-###
-### The module describing java library build.
-###
-### Documentation: https://wiki.yandex-team.ru/yatool/java/
-module JAVA_LIBRARY: JAR_LIBRARY {
+    .CMD=${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON ${input;pre=build/scripts/:DEBUG.py} $JDK_RESOURCE/bin/java -Dfile.encoding=utf8 -classpath ${RUN_JAR_PROG_CP_PRE}${tool:"tools/acceleo"}${RUN_JAR_PROG_CP_SUF} ru.yandex.se.logsng.tool.Cli $_INPUT_WITH_FLAG(--xsd IN $XSD) $_INPUT_WITH_FLAG(--mtl IN $MTL) $_INPUT_WITH_FLAG(--lang IN $LANG) --output-dir $BINDIR --build-root ${ARCADIA_BUILD_ROOT} --source-root ${ARCADIA_ROOT}  --mtl-root $MTL_ROOT ${output_include;hide:OUTPUT_INCLUDES} ${output;hide:OUT} ${output;noauto;hide:OUT_NOAUTO} ${kv;hide:"p JV"} ${kv;hide:"pc light-blue"} ${kv;hide:"show_out"} 
+} 
+ 
+### @usage: JAVA_LIBRARY() 
+### 
+### The module describing java library build. 
+### 
+### Documentation: https://wiki.yandex-team.ru/yatool/java/ 
+module JAVA_LIBRARY: JAR_LIBRARY { 
     .ALIASES=REQUIREMENTS=JAVA_REQUIREMENTS
-}
-
-### @usage: JAVA_PROGRAM()
-###
-### The module describing java programs build.
-### Output artifacts: .jar and directory with all the jar to the classpath of the formation.
-###
-### Documentation: https://wiki.yandex-team.ru/yatool/java/
-multimodule JAVA_PROGRAM {
-    module JAR_RUNABLE: _JAR_RUNABLE {
-        .ALLOWED=JAVA_RUNTIME_PEERDIR JAVA_RUNTIME_EXCLUDE
-        # TODO(svidyuk) JAVA_DEPENDENCIES_CONFIGURATION must not be ignored here but there are diagnostics issues in case of ECLUDE in the middle:
-        # * A -> B -> C -> lib-v1.4
-        #    |    |-> DM(lib-v1.1)
-        #    |    |-> EXCLUDE(lib-v1.4)
-        #    |    |-> FORBID_CONFLICT_DM_RECENT = OK
-        #    |-> DM(lib-v1.1)
-        #    |-> FORBID_CONFLICT_DM_RECENT = FAIL (because downgrade from v1.4 to v1.1 is detected before understanding that v1.4 was excuded on the examined path)
-        .IGNORED=RUN_JAVA_PROGRAM JAVA_DEPENDENCIES_CONFIGURATION
-        .ALIASES=JAVA_RUNTIME_PEERDIR=PEERDIR JAVA_RUNTIME_EXCLUDE=EXCLUDE
-        .PEERDIRSELF=JAR_COMPILATION
-
-        SET(MODULE_TYPE JAVA_PROGRAM)
-    }
-    module JAR_COMPILATION: JAR_LIBRARY {
-        .IGNORED=JAVA_RUNTIME_PEERDIR JAVA_RUNTIME_EXCLUDE
+} 
+ 
+### @usage: JAVA_PROGRAM() 
+### 
+### The module describing java programs build. 
+### Output artifacts: .jar and directory with all the jar to the classpath of the formation. 
+### 
+### Documentation: https://wiki.yandex-team.ru/yatool/java/ 
+multimodule JAVA_PROGRAM { 
+    module JAR_RUNABLE: _JAR_RUNABLE { 
+        .ALLOWED=JAVA_RUNTIME_PEERDIR JAVA_RUNTIME_EXCLUDE 
+        # TODO(svidyuk) JAVA_DEPENDENCIES_CONFIGURATION must not be ignored here but there are diagnostics issues in case of ECLUDE in the middle: 
+        # * A -> B -> C -> lib-v1.4 
+        #    |    |-> DM(lib-v1.1) 
+        #    |    |-> EXCLUDE(lib-v1.4) 
+        #    |    |-> FORBID_CONFLICT_DM_RECENT = OK 
+        #    |-> DM(lib-v1.1) 
+        #    |-> FORBID_CONFLICT_DM_RECENT = FAIL (because downgrade from v1.4 to v1.1 is detected before understanding that v1.4 was excuded on the examined path) 
+        .IGNORED=RUN_JAVA_PROGRAM JAVA_DEPENDENCIES_CONFIGURATION 
+        .ALIASES=JAVA_RUNTIME_PEERDIR=PEERDIR JAVA_RUNTIME_EXCLUDE=EXCLUDE 
+        .PEERDIRSELF=JAR_COMPILATION 
+ 
+        SET(MODULE_TYPE JAVA_PROGRAM) 
+    } 
+    module JAR_COMPILATION: JAR_LIBRARY { 
+        .IGNORED=JAVA_RUNTIME_PEERDIR JAVA_RUNTIME_EXCLUDE 
         .ALIASES=JAVA_RUNTIME_PEERDIR=_NOOP_MACRO JAVA_RUNTIME_EXCLUDE=_NOOP_MACRO REQUIREMENTS=JAVA_REQUIREMENTS
-        .FINAL_TARGET=no
-        SET(MODULE_TYPE JAVA_PROGRAM)
-    }
-}
-
-multimodule JUNIT5 {
-    module JAR_TESTABLE: _JAR_TEST {
-        .ALLOWED=YT_SPEC
-        # TODO(svidyuk) JAVA_DEPENDENCIES_CONFIGURATION must not be ignored here but there are diagnostics issues in case of ECLUDE in the middle:
-        # * A -> B -> C -> lib-v1.4
-        #    |    |-> DM(lib-v1.1)
-        #    |    |-> EXCLUDE(lib-v1.4)
-        #    |    |-> FORBID_CONFLICT_DM_RECENT = OK
-        #    |-> DM(lib-v1.1)
-        #    |-> FORBID_CONFLICT_DM_RECENT = FAIL (because downgrade from v1.4 to v1.1 is detected before understanding that v1.4 was excuded on the examined path)
-        .IGNORED=JAVA_SRCS RUN_JAVA_PROGRAM JAVA_DEPENDENCIES_CONFIGURATION
-        .ALIASES=JAVA_TEST_PEERDIR=PEERDIR JAVA_TEST_EXCLUDE=EXCLUDE
-        .PEERDIRSELF=JAR_COMPILATION
-
-        SET(MODULE_TYPE JUNIT5)
-    }
-    module JAR_COMPILATION: JAR_LIBRARY {
-        .ALLOWED=YT_SPEC
-        .ALIASES=JAVA_TEST_PEERDIR=_NOOP_MACRO JAVA_TEST_EXCLUDE=_NOOP_MACRO
-        .FINAL_TARGET=no
-
-        PEERDIR(devtools/junit5-runner build/platform/java/jacoco-agent)
-        SET(MODULE_TYPE JUNIT5)
-    }
-}
-
-multimodule JTEST {
-    module JAR_TESTABLE: _JAR_TEST {
-        .ALLOWED=YT_SPEC
-        # TODO(svidyuk) JAVA_DEPENDENCIES_CONFIGURATION must not be ignored here but there are diagnostics issues in case of ECLUDE in the middle:
-        # * A -> B -> C -> lib-v1.4
-        #    |    |-> DM(lib-v1.1)
-        #    |    |-> EXCLUDE(lib-v1.4)
-        #    |    |-> FORBID_CONFLICT_DM_RECENT = OK
-        #    |-> DM(lib-v1.1)
-        #    |-> FORBID_CONFLICT_DM_RECENT = FAIL (because downgrade from v1.4 to v1.1 is detected before understanding that v1.4 was excuded on the examined path)
-        .IGNORED=JAVA_SRCS RUN_JAVA_PROGRAM JAVA_DEPENDENCIES_CONFIGURATION
-        .ALIASES=JAVA_TEST_PEERDIR=PEERDIR JAVA_TEST_EXCLUDE=EXCLUDE
-        .PEERDIRSELF=JAR_COMPILATION
-
-        SET(MODULE_TYPE JTEST)
-        PEERDIR(devtools/junit-runner)
-        DEPENDENCY_MANAGEMENT(contrib/java/com/google/code/gson/gson/2.8.6 contrib/java/com/beust/jcommander/1.72 contrib/java/junit/junit/4.12)
-    }
-    module JAR_COMPILATION: JAR_LIBRARY {
-        .ALLOWED=YT_SPEC
-        .ALIASES=JAVA_TEST_PEERDIR=_NOOP_MACRO JAVA_TEST_EXCLUDE=_NOOP_MACRO
-        .FINAL_TARGET=no
-
-        SET(MODULE_TYPE JTEST)
-        DEPENDS(contrib/java/org/sonarsource/scanner/cli/sonar-scanner-cli/2.8)
-        PEERDIR(build/platform/java/jacoco-agent)
-    }
-}
-
-multimodule JTEST_FOR {
-    module JAR_TESTABLE: _JAR_TEST {
-        .ALLOWED=YT_SPEC
-        # TODO(svidyuk) JAVA_DEPENDENCIES_CONFIGURATION must not be ignored here but there are diagnostics issues in case of ECLUDE in the middle:
-        # * A -> B -> C -> lib-v1.4
-        #    |    |-> DM(lib-v1.1)
-        #    |    |-> EXCLUDE(lib-v1.4)
-        #    |    |-> FORBID_CONFLICT_DM_RECENT = OK
-        #    |-> DM(lib-v1.1)
-        #    |-> FORBID_CONFLICT_DM_RECENT = FAIL (because downgrade from v1.4 to v1.1 is detected before understanding that v1.4 was excuded on the examined path)
-        .IGNORED=JAVA_SRCS RUN_JAVA_PROGRAM JAVA_DEPENDENCIES_CONFIGURATION
-        .ALIASES=JAVA_TEST_PEERDIR=PEERDIR JAVA_TEST_EXCLUDE=EXCLUDE
-        .PEERDIRSELF=JAR_COMPILATION
-
-        SET(MODULE_TYPE JTEST_FOR)
-        PEERDIR(${UNITTEST_DIR} devtools/junit-runner)
-        DEPENDENCY_MANAGEMENT(contrib/java/com/google/code/gson/gson/2.8.6 contrib/java/com/beust/jcommander/1.72 contrib/java/junit/junit/4.12)
-    }
-    module JAR_COMPILATION: JAR_LIBRARY {
-        .ALLOWED=YT_SPEC
-        .ALIASES=JAVA_TEST_PEERDIR=_NOOP_MACRO JAVA_TEST_EXCLUDE=_NOOP_MACRO
-        .FINAL_TARGET=no
-
-        SET(MODULE_TYPE JTEST_FOR)
-        DEPENDS(contrib/java/org/sonarsource/scanner/cli/sonar-scanner-cli/2.8)
-        PEERDIR(devtools/junit-runner build/platform/java/jacoco-agent ${UNITTEST_DIR})
-    }
-}
-
-multimodule JAVA_CONTRIB_PROGRAM {
-    module JAR_RUNABLE: _JAR_RUNABLE {
-        .IGNORED=JAVA_SRCS RUN_JAR_PROGRAM RUN_JAVA_PROGRAM JAR_RESOURCE SRC_RESOURCE LOCAL_JAR
-        .PEERDIRSELF=JAR_COMPILATION
-
-        SET(MODULE_TYPE JAVA_PROGRAM)
-        ENABLE(DISABLE_SCRIPTGEN)
-    }
-    module JAR_COMPILATION: JAVA_CONTRIB {
-        .ALIASES=JAVA_RUNTIME_PEERDIR=_NOOP_MACRO JAVA_RUNTIME_EXCLUDE=_NOOP_MACRO
-        .FINAL_TARGET=no
-    }
-}
-
-module _DLL_COMPATIBLE_JAVA_LIBRARY: EXTERNAL_JAVA_LIBRARY {
+        .FINAL_TARGET=no 
+        SET(MODULE_TYPE JAVA_PROGRAM) 
+    } 
+} 
+ 
+multimodule JUNIT5 { 
+    module JAR_TESTABLE: _JAR_TEST { 
+        .ALLOWED=YT_SPEC 
+        # TODO(svidyuk) JAVA_DEPENDENCIES_CONFIGURATION must not be ignored here but there are diagnostics issues in case of ECLUDE in the middle: 
+        # * A -> B -> C -> lib-v1.4 
+        #    |    |-> DM(lib-v1.1) 
+        #    |    |-> EXCLUDE(lib-v1.4) 
+        #    |    |-> FORBID_CONFLICT_DM_RECENT = OK 
+        #    |-> DM(lib-v1.1) 
+        #    |-> FORBID_CONFLICT_DM_RECENT = FAIL (because downgrade from v1.4 to v1.1 is detected before understanding that v1.4 was excuded on the examined path) 
+        .IGNORED=JAVA_SRCS RUN_JAVA_PROGRAM JAVA_DEPENDENCIES_CONFIGURATION 
+        .ALIASES=JAVA_TEST_PEERDIR=PEERDIR JAVA_TEST_EXCLUDE=EXCLUDE 
+        .PEERDIRSELF=JAR_COMPILATION 
+ 
+        SET(MODULE_TYPE JUNIT5) 
+    } 
+    module JAR_COMPILATION: JAR_LIBRARY { 
+        .ALLOWED=YT_SPEC 
+        .ALIASES=JAVA_TEST_PEERDIR=_NOOP_MACRO JAVA_TEST_EXCLUDE=_NOOP_MACRO 
+        .FINAL_TARGET=no 
+ 
+        PEERDIR(devtools/junit5-runner build/platform/java/jacoco-agent) 
+        SET(MODULE_TYPE JUNIT5) 
+    } 
+} 
+ 
+multimodule JTEST { 
+    module JAR_TESTABLE: _JAR_TEST { 
+        .ALLOWED=YT_SPEC 
+        # TODO(svidyuk) JAVA_DEPENDENCIES_CONFIGURATION must not be ignored here but there are diagnostics issues in case of ECLUDE in the middle: 
+        # * A -> B -> C -> lib-v1.4 
+        #    |    |-> DM(lib-v1.1) 
+        #    |    |-> EXCLUDE(lib-v1.4) 
+        #    |    |-> FORBID_CONFLICT_DM_RECENT = OK 
+        #    |-> DM(lib-v1.1) 
+        #    |-> FORBID_CONFLICT_DM_RECENT = FAIL (because downgrade from v1.4 to v1.1 is detected before understanding that v1.4 was excuded on the examined path) 
+        .IGNORED=JAVA_SRCS RUN_JAVA_PROGRAM JAVA_DEPENDENCIES_CONFIGURATION 
+        .ALIASES=JAVA_TEST_PEERDIR=PEERDIR JAVA_TEST_EXCLUDE=EXCLUDE 
+        .PEERDIRSELF=JAR_COMPILATION 
+ 
+        SET(MODULE_TYPE JTEST) 
+        PEERDIR(devtools/junit-runner) 
+        DEPENDENCY_MANAGEMENT(contrib/java/com/google/code/gson/gson/2.8.6 contrib/java/com/beust/jcommander/1.72 contrib/java/junit/junit/4.12) 
+    } 
+    module JAR_COMPILATION: JAR_LIBRARY { 
+        .ALLOWED=YT_SPEC 
+        .ALIASES=JAVA_TEST_PEERDIR=_NOOP_MACRO JAVA_TEST_EXCLUDE=_NOOP_MACRO 
+        .FINAL_TARGET=no 
+ 
+        SET(MODULE_TYPE JTEST) 
+        DEPENDS(contrib/java/org/sonarsource/scanner/cli/sonar-scanner-cli/2.8) 
+        PEERDIR(build/platform/java/jacoco-agent) 
+    } 
+} 
+ 
+multimodule JTEST_FOR { 
+    module JAR_TESTABLE: _JAR_TEST { 
+        .ALLOWED=YT_SPEC 
+        # TODO(svidyuk) JAVA_DEPENDENCIES_CONFIGURATION must not be ignored here but there are diagnostics issues in case of ECLUDE in the middle: 
+        # * A -> B -> C -> lib-v1.4 
+        #    |    |-> DM(lib-v1.1) 
+        #    |    |-> EXCLUDE(lib-v1.4) 
+        #    |    |-> FORBID_CONFLICT_DM_RECENT = OK 
+        #    |-> DM(lib-v1.1) 
+        #    |-> FORBID_CONFLICT_DM_RECENT = FAIL (because downgrade from v1.4 to v1.1 is detected before understanding that v1.4 was excuded on the examined path) 
+        .IGNORED=JAVA_SRCS RUN_JAVA_PROGRAM JAVA_DEPENDENCIES_CONFIGURATION 
+        .ALIASES=JAVA_TEST_PEERDIR=PEERDIR JAVA_TEST_EXCLUDE=EXCLUDE 
+        .PEERDIRSELF=JAR_COMPILATION 
+ 
+        SET(MODULE_TYPE JTEST_FOR) 
+        PEERDIR(${UNITTEST_DIR} devtools/junit-runner) 
+        DEPENDENCY_MANAGEMENT(contrib/java/com/google/code/gson/gson/2.8.6 contrib/java/com/beust/jcommander/1.72 contrib/java/junit/junit/4.12) 
+    } 
+    module JAR_COMPILATION: JAR_LIBRARY { 
+        .ALLOWED=YT_SPEC 
+        .ALIASES=JAVA_TEST_PEERDIR=_NOOP_MACRO JAVA_TEST_EXCLUDE=_NOOP_MACRO 
+        .FINAL_TARGET=no 
+ 
+        SET(MODULE_TYPE JTEST_FOR) 
+        DEPENDS(contrib/java/org/sonarsource/scanner/cli/sonar-scanner-cli/2.8) 
+        PEERDIR(devtools/junit-runner build/platform/java/jacoco-agent ${UNITTEST_DIR}) 
+    } 
+} 
+ 
+multimodule JAVA_CONTRIB_PROGRAM { 
+    module JAR_RUNABLE: _JAR_RUNABLE { 
+        .IGNORED=JAVA_SRCS RUN_JAR_PROGRAM RUN_JAVA_PROGRAM JAR_RESOURCE SRC_RESOURCE LOCAL_JAR 
+        .PEERDIRSELF=JAR_COMPILATION 
+ 
+        SET(MODULE_TYPE JAVA_PROGRAM) 
+        ENABLE(DISABLE_SCRIPTGEN) 
+    } 
+    module JAR_COMPILATION: JAVA_CONTRIB { 
+        .ALIASES=JAVA_RUNTIME_PEERDIR=_NOOP_MACRO JAVA_RUNTIME_EXCLUDE=_NOOP_MACRO 
+        .FINAL_TARGET=no 
+    } 
+} 
+ 
+module _DLL_COMPATIBLE_JAVA_LIBRARY: EXTERNAL_JAVA_LIBRARY { 
     SET(DONT_RESOLVE_INCLUDES yes)
-}
-
-### @usage: DLL_JAVA()
-###
-### DLL built using swig for Java. Produces dynamic library and a .jar.
-### Dynamic library is treated the same as in the case of PEERDIR from Java to DLL.
-### .jar goes on the classpath.
-###
-### Documentation: https://wiki.yandex-team.ru/yatool/java/#integracijascpp/pythonsborkojj
-multimodule DLL_JAVA {
-    module JNI_DLL: DLL {
-        .ALIASES=SRCS=_SWIG_LANG_FILTERED_SRCS
-        SET(SWIG_LANG jni_cpp)
+} 
+ 
+### @usage: DLL_JAVA() 
+### 
+### DLL built using swig for Java. Produces dynamic library and a .jar. 
+### Dynamic library is treated the same as in the case of PEERDIR from Java to DLL. 
+### .jar goes on the classpath. 
+### 
+### Documentation: https://wiki.yandex-team.ru/yatool/java/#integracijascpp/pythonsborkojj 
+multimodule DLL_JAVA { 
+    module JNI_DLL: DLL { 
+        .ALIASES=SRCS=_SWIG_LANG_FILTERED_SRCS 
+        SET(SWIG_LANG jni_cpp) 
         .FINAL_TARGET=no
-    }
-    module JAR_COMPILATION: _DLL_COMPATIBLE_JAVA_LIBRARY {
-        .ALIASES=SRCS=_SWIG_LANG_FILTERED_SRCS PEERDIR=_NOOP_MACRO
-        .PEERDIRSELF=JNI_DLL
-        SET(SWIG_LANG jni_java)
-        PEERDIR+=build/platform/java/jdk
+    } 
+    module JAR_COMPILATION: _DLL_COMPATIBLE_JAVA_LIBRARY { 
+        .ALIASES=SRCS=_SWIG_LANG_FILTERED_SRCS PEERDIR=_NOOP_MACRO 
+        .PEERDIRSELF=JNI_DLL 
+        SET(SWIG_LANG jni_java) 
+        PEERDIR+=build/platform/java/jdk 
         PEERDIR+=$JDK_RESOURCE_PEERDIR
         .FINAL_TARGET=yes
-    }
-}
+    } 
+} 
diff --git a/build/conf/jbuild.ymake.conf b/build/conf/jbuild.ymake.conf
index 945a7cc979..08dcb14624 100644
--- a/build/conf/jbuild.ymake.conf
+++ b/build/conf/jbuild.ymake.conf
@@ -1,122 +1,122 @@
-YMAKE_JAVA_MODULES=no
-JBUILD_JAVA_MODULES=yes
-
-EXTERNAL_JAR_VALUE=
-### @usage: EXTERNAL_JAR(library.jar)
-###
-### Provide an external name for built JAVA_LIBRARY() or JAVA_PROGRAM()
-###
-### Documentation: https://wiki.yandex-team.ru/yatool/java/#ispolzovanievneshnixmavenbibliotek
-macro EXTERNAL_JAR(Args...) {
-    SET_APPEND(EXTERNAL_JAR_VALUE $ARGS_DELIM $Args)
-}
-
-### @usage: JAVA_LIBRARY()
-###
-### The module describing java library build.
-###
-### Documentation: https://wiki.yandex-team.ru/yatool/java/
-module JAVA_LIBRARY: _JAVA_PLACEHOLDER {
-    SET(MODULE_TYPE JAVA_LIBRARY)
-}
-
-### @usage: JAVA_PROGRAM()
-###
-### The module describing java programs build.
-### Output artifacts: .jar and directory with all the jar to the classpath of the formation.
-###
-### Documentation: https://wiki.yandex-team.ru/yatool/java/
-module JAVA_PROGRAM: _JAVA_PLACEHOLDER {
-    .ALIASES=JAVA_RUNTIME_PEERDIR=PEERDIR JAVA_RUNTIME_EXCLUDE=EXCLUDE
-    SET(MODULE_TYPE JAVA_PROGRAM)
-}
-
-### @usage: JUNIT5()
-###
-### Java tests module based on JUnit 5 framework.
-###
-### If requested, build system will scan the source code of the module for the presence of junit tests and run them.
-### Output artifacts: a jar, a directory of exhaust tests(if required run the tests) - test logs, system logs testiranja, temporary files, tests, etc.
-###
-### Documentation: https://wiki.yandex-team.ru/yatool/test/#testynajava
-module JUNIT5: _JAVA_PLACEHOLDER {
-    .ALIASES=JAVA_TEST_PEERDIR=PEERDIR JAVA_TEST_EXCLUDE=EXCLUDE
-    SET(MODULE_TYPE JUNIT5)
-    SET(TEST_RUNNER devtools/junit5-runner)
-    SET(TEST_CLASSPATH_VALUE ${MODDIR} ${TEST_RUNNER})
-    # Used as place to add managed dependencies for test execution and take them into account
-    # during traverses properly.
-    _RUN_JAVA(TOOL ${TEST_RUNNER} OUT fake.out.java_test_cmd)
-
-    PEERDIR(${TEST_RUNNER})
-    PEERDIR(build/platform/java/jacoco-agent)
-    JAVA_TEST()
-}
-
-### @usage: JTEST()
-###
-### Java tests module based on JUnit 4 framework.
-###
-### If requested, build system will scan the source code of the module for the presence of junit tests and run them.
-### Output artifacts: a jar, a directory of exhaust tests(if required run the tests) - test logs, system logs testiranja, temporary files, tests, etc.
-###
-### Documentation: https://wiki.yandex-team.ru/yatool/test/#testynajava
-module JTEST: _JAVA_PLACEHOLDER {
-    .ALLOWED=YT_SPEC
-    .ALIASES=JAVA_TEST_PEERDIR=PEERDIR JAVA_TEST_EXCLUDE=EXCLUDE
-    SET(MODULE_TYPE JTEST)
-    SET(TEST_RUNNER devtools/junit-runner)
-    SET(TEST_CLASSPATH_VALUE ${MODDIR} ${TEST_RUNNER})
-    # Used as place to add managed dependencies for test execution and take them into account
-    # during traverses properly.
-    _RUN_JAVA(TOOL ${TEST_RUNNER} OUT fake.out.java_test_cmd)
-
-    # TODO: if <needs_sonar>
-    DEPENDS(contrib/java/org/sonarsource/scanner/cli/sonar-scanner-cli/2.8)
-    DEPENDS(${TEST_RUNNER})
-    _GHOST_PEERDIR(${TEST_RUNNER})
-    PEERDIR(build/platform/java/jacoco-agent)
-    JAVA_TEST()
-
-    SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
-}
-
-### @usage: JTEST_FOR(ModuleDir)
-###
-### Convinience java tests module based on JUnit 4 framework for specified library or program.
-###
-### In contrast to the JTEST, the build system will scan for the presence of the test sources of the module in ModuleDir . As ModuleDir should contain JAVA_PROGRAM or JAVA_LIBRARY . JTEST_FOR also can have its own source, in this case they will be compiled and added to the classpath of a test run.
-### Output artifacts: a jar, a directory of exhaust tests(if requested tests are run).
-###
-### Documentation: https://wiki.yandex-team.ru/yatool/test/#testynajava
-module JTEST_FOR: JTEST {
-    .ALIASES=JAVA_TEST_PEERDIR=PEERDIR JAVA_TEST_EXCLUDE=EXCLUDE
-    SET(MODULE_TYPE JTEST_FOR)
-    SET(TEST_CLASSPATH_VALUE ${MODDIR} ${TEST_RUNNER} ${UNITTEST_DIR})
-
-    PEERDIR($UNITTEST_DIR)
-    SET(REALPRJNAME jtest)
-    JAVA_TEST()
-}
-
-module JAVA_CONTRIB_PROGRAM: JAVA_CONTRIB {
-    SET(MODULE_TYPE JAVA_PROGRAM)
-    ENABLE(DISABLE_SCRIPTGEN)
-}
-
-### @usage: DLL_JAVA()
-###
-### DLL built using swig for Java. Produces dynamic library and a .jar.
-### Dynamic library is treated the same as in the case of PEERDIR from Java to DLL.
-### .jar goes on the classpath.
-###
-### Documentation: https://wiki.yandex-team.ru/yatool/java/#integracijascpp/pythonsborkojj
-module DLL_JAVA: DLL {
-    .EXTS=.o .obj .jsrc .java .mf
-    .CMD=SWIG_DLL_JAR_CMD
-    PEERDIR(build/platform/java/jdk)
+YMAKE_JAVA_MODULES=no 
+JBUILD_JAVA_MODULES=yes 
+ 
+EXTERNAL_JAR_VALUE= 
+### @usage: EXTERNAL_JAR(library.jar) 
+### 
+### Provide an external name for built JAVA_LIBRARY() or JAVA_PROGRAM() 
+### 
+### Documentation: https://wiki.yandex-team.ru/yatool/java/#ispolzovanievneshnixmavenbibliotek 
+macro EXTERNAL_JAR(Args...) { 
+    SET_APPEND(EXTERNAL_JAR_VALUE $ARGS_DELIM $Args) 
+} 
+ 
+### @usage: JAVA_LIBRARY() 
+### 
+### The module describing java library build. 
+### 
+### Documentation: https://wiki.yandex-team.ru/yatool/java/ 
+module JAVA_LIBRARY: _JAVA_PLACEHOLDER { 
+    SET(MODULE_TYPE JAVA_LIBRARY) 
+} 
+ 
+### @usage: JAVA_PROGRAM() 
+### 
+### The module describing java programs build. 
+### Output artifacts: .jar and directory with all the jar to the classpath of the formation. 
+### 
+### Documentation: https://wiki.yandex-team.ru/yatool/java/ 
+module JAVA_PROGRAM: _JAVA_PLACEHOLDER { 
+    .ALIASES=JAVA_RUNTIME_PEERDIR=PEERDIR JAVA_RUNTIME_EXCLUDE=EXCLUDE 
+    SET(MODULE_TYPE JAVA_PROGRAM) 
+} 
+ 
+### @usage: JUNIT5() 
+### 
+### Java tests module based on JUnit 5 framework. 
+### 
+### If requested, build system will scan the source code of the module for the presence of junit tests and run them. 
+### Output artifacts: a jar, a directory of exhaust tests(if required run the tests) - test logs, system logs testiranja, temporary files, tests, etc. 
+### 
+### Documentation: https://wiki.yandex-team.ru/yatool/test/#testynajava 
+module JUNIT5: _JAVA_PLACEHOLDER { 
+    .ALIASES=JAVA_TEST_PEERDIR=PEERDIR JAVA_TEST_EXCLUDE=EXCLUDE 
+    SET(MODULE_TYPE JUNIT5) 
+    SET(TEST_RUNNER devtools/junit5-runner) 
+    SET(TEST_CLASSPATH_VALUE ${MODDIR} ${TEST_RUNNER}) 
+    # Used as place to add managed dependencies for test execution and take them into account 
+    # during traverses properly. 
+    _RUN_JAVA(TOOL ${TEST_RUNNER} OUT fake.out.java_test_cmd) 
+ 
+    PEERDIR(${TEST_RUNNER}) 
+    PEERDIR(build/platform/java/jacoco-agent) 
+    JAVA_TEST() 
+} 
+ 
+### @usage: JTEST() 
+### 
+### Java tests module based on JUnit 4 framework. 
+### 
+### If requested, build system will scan the source code of the module for the presence of junit tests and run them. 
+### Output artifacts: a jar, a directory of exhaust tests(if required run the tests) - test logs, system logs testiranja, temporary files, tests, etc. 
+### 
+### Documentation: https://wiki.yandex-team.ru/yatool/test/#testynajava 
+module JTEST: _JAVA_PLACEHOLDER { 
+    .ALLOWED=YT_SPEC 
+    .ALIASES=JAVA_TEST_PEERDIR=PEERDIR JAVA_TEST_EXCLUDE=EXCLUDE 
+    SET(MODULE_TYPE JTEST) 
+    SET(TEST_RUNNER devtools/junit-runner) 
+    SET(TEST_CLASSPATH_VALUE ${MODDIR} ${TEST_RUNNER}) 
+    # Used as place to add managed dependencies for test execution and take them into account 
+    # during traverses properly. 
+    _RUN_JAVA(TOOL ${TEST_RUNNER} OUT fake.out.java_test_cmd) 
+ 
+    # TODO: if <needs_sonar> 
+    DEPENDS(contrib/java/org/sonarsource/scanner/cli/sonar-scanner-cli/2.8) 
+    DEPENDS(${TEST_RUNNER}) 
+    _GHOST_PEERDIR(${TEST_RUNNER}) 
+    PEERDIR(build/platform/java/jacoco-agent) 
+    JAVA_TEST() 
+ 
+    SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json) 
+} 
+ 
+### @usage: JTEST_FOR(ModuleDir) 
+### 
+### Convinience java tests module based on JUnit 4 framework for specified library or program. 
+### 
+### In contrast to the JTEST, the build system will scan for the presence of the test sources of the module in ModuleDir . As ModuleDir should contain JAVA_PROGRAM or JAVA_LIBRARY . JTEST_FOR also can have its own source, in this case they will be compiled and added to the classpath of a test run. 
+### Output artifacts: a jar, a directory of exhaust tests(if requested tests are run). 
+### 
+### Documentation: https://wiki.yandex-team.ru/yatool/test/#testynajava 
+module JTEST_FOR: JTEST { 
+    .ALIASES=JAVA_TEST_PEERDIR=PEERDIR JAVA_TEST_EXCLUDE=EXCLUDE 
+    SET(MODULE_TYPE JTEST_FOR) 
+    SET(TEST_CLASSPATH_VALUE ${MODDIR} ${TEST_RUNNER} ${UNITTEST_DIR}) 
+ 
+    PEERDIR($UNITTEST_DIR) 
+    SET(REALPRJNAME jtest) 
+    JAVA_TEST() 
+} 
+ 
+module JAVA_CONTRIB_PROGRAM: JAVA_CONTRIB { 
+    SET(MODULE_TYPE JAVA_PROGRAM) 
+    ENABLE(DISABLE_SCRIPTGEN) 
+} 
+ 
+### @usage: DLL_JAVA() 
+### 
+### DLL built using swig for Java. Produces dynamic library and a .jar. 
+### Dynamic library is treated the same as in the case of PEERDIR from Java to DLL. 
+### .jar goes on the classpath. 
+### 
+### Documentation: https://wiki.yandex-team.ru/yatool/java/#integracijascpp/pythonsborkojj 
+module DLL_JAVA: DLL { 
+    .EXTS=.o .obj .jsrc .java .mf 
+    .CMD=SWIG_DLL_JAR_CMD 
+    PEERDIR(build/platform/java/jdk) 
     PEERDIR+=$JDK_RESOURCE_PEERDIR
-
-    PROPAGATES_MANAGEABLE_PEERS=yes
-    SET(SWIG_LANG java)
-}
+ 
+    PROPAGATES_MANAGEABLE_PEERS=yes 
+    SET(SWIG_LANG java) 
+} 
diff --git a/build/platform/java/kythe/ya.make b/build/platform/java/kythe/ya.make
index d5a9237f68..53724cbae2 100644
--- a/build/platform/java/kythe/ya.make
+++ b/build/platform/java/kythe/ya.make
@@ -1,10 +1,10 @@
-RESOURCES_LIBRARY()
-OWNER(g:ymake)
-
-IF(USE_SYSTEM_KYTHE)
-    MESSAGE(WARNING System Kythe $USE_SYSTEM_KYTHE will be used)
-ELSE()
-    DECLARE_EXTERNAL_RESOURCE(KYTHE sbr:837801347)
-ENDIF()
-
-END()
+RESOURCES_LIBRARY() 
+OWNER(g:ymake) 
+ 
+IF(USE_SYSTEM_KYTHE) 
+    MESSAGE(WARNING System Kythe $USE_SYSTEM_KYTHE will be used) 
+ELSE() 
+    DECLARE_EXTERNAL_RESOURCE(KYTHE sbr:837801347) 
+ENDIF() 
+ 
+END() 
diff --git a/build/platform/java/scriptgen/ya.make b/build/platform/java/scriptgen/ya.make
index d296097f52..b919064600 100644
--- a/build/platform/java/scriptgen/ya.make
+++ b/build/platform/java/scriptgen/ya.make
@@ -1,27 +1,27 @@
-RESOURCES_LIBRARY()
-OWNER(g:ymake)
-
-SET(SCRIPTGEN_LINUX sbr:2654452283)
-SET(SCRIPTGEN_DARWIN_ARM64 sbr:2654451866)
-SET(SCRIPTGEN_DARWIN sbr:2654452096)
-SET(SCRIPTGEN_WIN32 sbr:2654451225)
-
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-    SCRIPTGEN
-    ${SCRIPTGEN_LINUX} FOR LINUX
-    ${SCRIPTGEN_DARWIN} FOR DARWIN
+RESOURCES_LIBRARY() 
+OWNER(g:ymake) 
+ 
+SET(SCRIPTGEN_LINUX sbr:2654452283) 
+SET(SCRIPTGEN_DARWIN_ARM64 sbr:2654451866) 
+SET(SCRIPTGEN_DARWIN sbr:2654452096) 
+SET(SCRIPTGEN_WIN32 sbr:2654451225) 
+ 
+DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( 
+    SCRIPTGEN 
+    ${SCRIPTGEN_LINUX} FOR LINUX 
+    ${SCRIPTGEN_DARWIN} FOR DARWIN 
     ${SCRIPTGEN_DARWIN_ARM64} FOR DARWIN-ARM64
-    ${SCRIPTGEN_WIN32} FOR WIN32
-)
-
+    ${SCRIPTGEN_WIN32} FOR WIN32 
+) 
+ 
 IF(OS_DARWIN AND ARCH_ARM64)
     DECLARE_EXTERNAL_RESOURCE(WITH_SCRIPTGEN ${SCRIPTGEN_DARWIN_ARM64})
 ELSEIF(OS_DARWIN AND ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(WITH_SCRIPTGEN ${SCRIPTGEN_DARWIN})
-ELSEIF(OS_LINUX)
-    DECLARE_EXTERNAL_RESOURCE(WITH_SCRIPTGEN ${SCRIPTGEN_LINUX})
-ELSEIF(OS_WINDOWS)
-    DECLARE_EXTERNAL_RESOURCE(WITH_SCRIPTGEN ${SCRIPTGEN_WIN32})
-ENDIF()
-
+    DECLARE_EXTERNAL_RESOURCE(WITH_SCRIPTGEN ${SCRIPTGEN_DARWIN}) 
+ELSEIF(OS_LINUX) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_SCRIPTGEN ${SCRIPTGEN_LINUX}) 
+ELSEIF(OS_WINDOWS) 
+    DECLARE_EXTERNAL_RESOURCE(WITH_SCRIPTGEN ${SCRIPTGEN_WIN32}) 
+ENDIF() 
+ 
 END()
diff --git a/build/platform/java/ya.make b/build/platform/java/ya.make
index 7194053b98..1aa469da29 100644
--- a/build/platform/java/ya.make
+++ b/build/platform/java/ya.make
@@ -6,5 +6,5 @@ RECURSE(
     jacoco-agent
     kotlin
     jstyle_lib
-    scriptgen
+    scriptgen 
 )
diff --git a/build/platform/python/python310/ya.make b/build/platform/python/python310/ya.make
index fea3696e6d..52d86429c1 100644
--- a/build/platform/python/python310/ya.make
+++ b/build/platform/python/python310/ya.make
@@ -7,14 +7,14 @@ OWNER(
 
 INCLUDE(${ARCADIA_ROOT}/build/platform/python/resources.inc)
 
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-    PYTHON310
-    ${PYTHON310_DARWIN} FOR DARWIN
-    ${PYTHON310_DARWIN_ARM64} FOR DARWIN-ARM64
-    ${PYTHON310_LINUX} FOR LINUX
-    ${PYTHON310_WINDOWS} FOR WIN32
-)
-
+DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( 
+    PYTHON310 
+    ${PYTHON310_DARWIN} FOR DARWIN 
+    ${PYTHON310_DARWIN_ARM64} FOR DARWIN-ARM64 
+    ${PYTHON310_LINUX} FOR LINUX 
+    ${PYTHON310_WINDOWS} FOR WIN32 
+) 
+ 
 IF (OS_LINUX)
     DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON310 ${PYTHON310_LINUX})
 ELSEIF (OS_DARWIN)
diff --git a/build/platform/python/ymake_python3/ya.make b/build/platform/python/ymake_python3/ya.make
index c781448641..2a311aeb99 100644
--- a/build/platform/python/ymake_python3/ya.make
+++ b/build/platform/python/ymake_python3/ya.make
@@ -1,33 +1,33 @@
-RESOURCES_LIBRARY()
-
-OWNER(
-    g:arcadia-devtools
-    g:yatool
-)
-
-SET(YMAKE_PYTHON3_LINUX sbr:2693706966)
-SET(YMAKE_PYTHON3_DARWIN sbr:2693705780)
-SET(YMAKE_PYTHON3_DARWIN_ARM64 sbr:2693704462)
-SET(YMAKE_PYTHON3_WINDOWS sbr:2693706398)
-
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-    YMAKE_PYTHON3
-    ${YMAKE_PYTHON3_DARWIN} FOR DARWIN
-    ${YMAKE_PYTHON3_DARWIN_ARM64} FOR DARWIN-ARM64
-    ${YMAKE_PYTHON3_LINUX} FOR LINUX
-    ${YMAKE_PYTHON3_WINDOWS} FOR WIN32
-)
-
-IF (OS_LINUX)
-    DECLARE_EXTERNAL_RESOURCE(EXTERNAL_YMAKE_PYTHON3 ${YMAKE_PYTHON3_LINUX})
-ELSEIF (OS_DARWIN)
-    IF (ARCH_ARM64)
-        DECLARE_EXTERNAL_RESOURCE(EXTERNAL_YMAKE_PYTHON3 ${YMAKE_PYTHON3_DARWIN_ARM64})
-    ELSEIF(ARCH_X86_64)
-        DECLARE_EXTERNAL_RESOURCE(EXTERNAL_YMAKE_PYTHON3 ${YMAKE_PYTHON3_DARWIN})
-    ENDIF()
-ELSEIF (OS_WINDOWS)
-    DECLARE_EXTERNAL_RESOURCE(EXTERNAL_YMAKE_PYTHON3 ${YMAKE_PYTHON3_WINDOWS})
-ENDIF()
-
-END()
+RESOURCES_LIBRARY() 
+ 
+OWNER( 
+    g:arcadia-devtools 
+    g:yatool 
+) 
+ 
+SET(YMAKE_PYTHON3_LINUX sbr:2693706966) 
+SET(YMAKE_PYTHON3_DARWIN sbr:2693705780) 
+SET(YMAKE_PYTHON3_DARWIN_ARM64 sbr:2693704462) 
+SET(YMAKE_PYTHON3_WINDOWS sbr:2693706398) 
+ 
+DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( 
+    YMAKE_PYTHON3 
+    ${YMAKE_PYTHON3_DARWIN} FOR DARWIN 
+    ${YMAKE_PYTHON3_DARWIN_ARM64} FOR DARWIN-ARM64 
+    ${YMAKE_PYTHON3_LINUX} FOR LINUX 
+    ${YMAKE_PYTHON3_WINDOWS} FOR WIN32 
+) 
+ 
+IF (OS_LINUX) 
+    DECLARE_EXTERNAL_RESOURCE(EXTERNAL_YMAKE_PYTHON3 ${YMAKE_PYTHON3_LINUX}) 
+ELSEIF (OS_DARWIN) 
+    IF (ARCH_ARM64) 
+        DECLARE_EXTERNAL_RESOURCE(EXTERNAL_YMAKE_PYTHON3 ${YMAKE_PYTHON3_DARWIN_ARM64}) 
+    ELSEIF(ARCH_X86_64) 
+        DECLARE_EXTERNAL_RESOURCE(EXTERNAL_YMAKE_PYTHON3 ${YMAKE_PYTHON3_DARWIN}) 
+    ENDIF() 
+ELSEIF (OS_WINDOWS) 
+    DECLARE_EXTERNAL_RESOURCE(EXTERNAL_YMAKE_PYTHON3 ${YMAKE_PYTHON3_WINDOWS}) 
+ENDIF() 
+ 
+END() 
diff --git a/build/plugins/java.py b/build/plugins/java.py
index 16fc126734..ff5281624a 100644
--- a/build/plugins/java.py
+++ b/build/plugins/java.py
@@ -31,7 +31,7 @@ def extract_macro_calls2(unit, macro_value_name):
     return calls
 
 
-def on_run_jbuild_program(unit, *args):
+def on_run_jbuild_program(unit, *args): 
     args = list(args)
     """
     Custom code generation
@@ -76,31 +76,31 @@ def ongenerate_script(unit, *args):
 
 def onjava_module(unit, *args):
     args_delim = unit.get('ARGS_DELIM')
-    idea_only = True if 'IDEA_ONLY' in args else False
-
-    if idea_only:
-        if unit.get('YA_IDE_IDEA') != 'yes':
-            return
-        if unit.get('YMAKE_JAVA_MODULES') != 'yes':
-            return
-
+    idea_only = True if 'IDEA_ONLY' in args else False 
+
+    if idea_only: 
+        if unit.get('YA_IDE_IDEA') != 'yes': 
+            return 
+        if unit.get('YMAKE_JAVA_MODULES') != 'yes': 
+            return 
+ 
     data = {
         'BUNDLE_NAME': unit.name(),
         'PATH': unit.path(),
-        'IDEA_ONLY': 'yes' if idea_only else 'no',
+        'IDEA_ONLY': 'yes' if idea_only else 'no', 
         'MODULE_TYPE': unit.get('MODULE_TYPE'),
         'MODULE_ARGS': unit.get('MODULE_ARGS'),
-        'MANAGED_PEERS': '${MANAGED_PEERS}',
-        'MANAGED_PEERS_CLOSURE': '${MANAGED_PEERS_CLOSURE}',
-        'NON_NAMAGEABLE_PEERS': '${NON_NAMAGEABLE_PEERS}',
-        'TEST_CLASSPATH_MANAGED': '${TEST_CLASSPATH_MANAGED}',
+        'MANAGED_PEERS': '${MANAGED_PEERS}', 
+        'MANAGED_PEERS_CLOSURE': '${MANAGED_PEERS_CLOSURE}', 
+        'NON_NAMAGEABLE_PEERS': '${NON_NAMAGEABLE_PEERS}', 
+        'TEST_CLASSPATH_MANAGED': '${TEST_CLASSPATH_MANAGED}', 
         'EXCLUDE': extract_macro_calls(unit, 'EXCLUDE_VALUE', args_delim),
         'JAVA_SRCS': extract_macro_calls(unit, 'JAVA_SRCS_VALUE', args_delim),
         'JAVAC_FLAGS': extract_macro_calls(unit, 'JAVAC_FLAGS_VALUE', args_delim),
         'ANNOTATION_PROCESSOR': extract_macro_calls(unit, 'ANNOTATION_PROCESSOR_VALUE', args_delim),
         'EXTERNAL_JAR': extract_macro_calls(unit, 'EXTERNAL_JAR_VALUE', args_delim),
         'RUN_JAVA_PROGRAM': extract_macro_calls2(unit, 'RUN_JAVA_PROGRAM_VALUE'),
-        'RUN_JAVA_PROGRAM_MANAGED': '${RUN_JAVA_PROGRAM_MANAGED}',
+        'RUN_JAVA_PROGRAM_MANAGED': '${RUN_JAVA_PROGRAM_MANAGED}', 
         'MAVEN_GROUP_ID': extract_macro_calls(unit, 'MAVEN_GROUP_ID_VALUE', args_delim),
         'JAR_INCLUDE_FILTER': extract_macro_calls(unit, 'JAR_INCLUDE_FILTER_VALUE', args_delim),
         'JAR_EXCLUDE_FILTER': extract_macro_calls(unit, 'JAR_EXCLUDE_FILTER_VALUE', args_delim),
@@ -219,151 +219,151 @@ def onjava_module(unit, *args):
     dart = 'JAVA_DART: ' + base64.b64encode(json.dumps(data)) + '\n' + DELIM + '\n'
 
     unit.set_property(['JAVA_DART_DATA', dart])
-    if not idea_only and unit.get('MODULE_TYPE') in ('JAVA_PROGRAM', 'JAVA_LIBRARY', 'JTEST', 'TESTNG', 'JUNIT5') and not unit.path().startswith('$S/contrib/java'):
-        unit.on_add_classpath_clash_check()
+    if not idea_only and unit.get('MODULE_TYPE') in ('JAVA_PROGRAM', 'JAVA_LIBRARY', 'JTEST', 'TESTNG', 'JUNIT5') and not unit.path().startswith('$S/contrib/java'): 
+        unit.on_add_classpath_clash_check() 
         if unit.get('LINT_LEVEL_VALUE') != "none":
             unit.onadd_check(['JAVA_STYLE', unit.get('LINT_LEVEL_VALUE')])
-
-
-def on_add_java_style_checks(unit, *args):
-    if unit.get('LINT_LEVEL_VALUE') != "none":
-        unit.onadd_check(['JAVA_STYLE', unit.get('LINT_LEVEL_VALUE')] + list(args))
-
-
-def on_add_classpath_clash_check(unit, *args):
-    jdeps_val = (unit.get('CHECK_JAVA_DEPS_VALUE') or '').lower()
-    if jdeps_val and jdeps_val not in ('yes', 'no', 'strict'):
-        ymake.report_configure_error('CHECK_JAVA_DEPS: "yes", "no" or "strict" required')
-    if jdeps_val and jdeps_val != 'no':
-        unit.onjava_test_deps(jdeps_val)
-
-
-# Ymake java modules related macroses
-
-
-def onexternal_jar(unit, *args):
-    args = list(args)
-    flat, kv = common.sort_by_keywords({'SOURCES': 1}, args)
-    if not flat:
-        ymake.report_configure_error('EXTERNAL_JAR requires exactly one resource URL of compiled jar library')
-    res = flat[0]
-    resid = res[4:] if res.startswith('sbr:') else res
-    unit.set(['JAR_LIB_RESOURCE', resid])
-    unit.set(['JAR_LIB_RESOURCE_URL', res])
-
-
-def on_check_java_srcdir(unit, *args):
-    args = list(args)
-    for arg in args:
-        if not '$' in arg:
-            arc_srcdir = os.path.join(unit.get('MODDIR'), arg)
-            abs_srcdir = unit.resolve(os.path.join("$S/", arc_srcdir))
-            if not os.path.exists(abs_srcdir) or not os.path.isdir(abs_srcdir):
-                ymake.report_configure_error(
-                    'Trying to set a [[alt1]]JAVA_SRCS[[rst]] for a missing directory: [[imp]]$S/{}[[rst]]',
-                    missing_dir=arc_srcdir
-                )
-            return
-        srcdir = unit.resolve_arc_path(arg)
-        if srcdir and not srcdir.startswith('$S'):
-            continue
-        abs_srcdir = unit.resolve(srcdir) if srcdir else unit.resolve(arg)
-        if not os.path.exists(abs_srcdir) or not os.path.isdir(abs_srcdir):
-            ymake.report_configure_error(
-                'Trying to set a [[alt1]]JAVA_SRCS[[rst]] for a missing directory: [[imp]]{}[[rst]]',
-                missing_dir=srcdir
-            )
-
-
-def on_fill_jar_copy_resources_cmd(unit, *args):
-    if len(args) == 4:
-        varname, srcdir, base_classes_dir, reslist = tuple(args)
-        package = ''
-    else:
-        varname, srcdir, base_classes_dir, package, reslist = tuple(args)
-    dest_dir = os.path.join(base_classes_dir, *package.split('.')) if package else base_classes_dir
-    var = unit.get(varname)
-    var += ' && $FS_TOOLS copy_files {} {} {}'.format(srcdir if srcdir.startswith('"$') else '${CURDIR}/' + srcdir, dest_dir, reslist)
-    unit.set([varname, var])
-
-def on_fill_jar_gen_srcs(unit, *args):
-    varname, jar_type, srcdir, base_classes_dir, java_list, kt_list, groovy_list, res_list = tuple(args[0:8])
-    resolved_srcdir = unit.resolve_arc_path(srcdir)
-    if not resolved_srcdir.startswith('$') or resolved_srcdir.startswith('$S'):
-        return
-
-    exclude_pos = args.index('EXCLUDE')
-    globs = args[7:exclude_pos]
-    excludes = args[exclude_pos + 1:]
-    var = unit.get(varname)
-    var += ' && ${{cwd:BINDIR}} $YMAKE_PYTHON ${{input:"build/scripts/resolve_java_srcs.py"}} --append -d {} -s {} -k {} -g {} -r {} --include-patterns {}'.format(srcdir, java_list, kt_list, groovy_list, res_list, ' '.join(globs))
-    if jar_type == 'SRC_JAR':
-        var += ' --all-resources'
-    if len(excludes) > 0:
-        var += ' --exclude-patterns {}'.format(' '.join(excludes))
-    if unit.get('WITH_KOTLIN_VALUE') == 'yes':
-        var += ' --resolve-kotlin'
-    unit.set([varname, var])
-
-
-def on_check_run_java_prog_classpath(unit, *args):
-    if len(args) != 1:
-        ymake.report_configure_error('multiple CLASSPATH elements in RUN_JAVA_PROGRAM invocation no more supported. Use JAVA_RUNTIME_PEERDIR on the JAVA_PROGRAM module instead')
-
-
-def extract_words(words, keys):
-    kv = {}
-    k = None
-
-    for w in words:
-        if w in keys:
-            k = w
-        else:
-            if not k in kv:
-                kv[k] = []
-            kv[k].append(w)
-
-    return kv
-
-
-def parse_words(words):
-    kv = extract_words(words, {'OUT', 'TEMPLATE'})
-    ws = []
-    for item in ('OUT', 'TEMPLATE'):
-        for i, word in list(enumerate(kv[item])):
-            if word == 'CUSTOM_PROPERTY':
-                ws += kv[item][i:]
-                kv[item] = kv[item][:i]
-    tepmlates = kv['TEMPLATE']
-    outputs = kv['OUT']
-    if len(outputs) < len(tepmlates):
-        ymake.report_configure_error('To many arguments for TEMPLATE parameter')
-        return
-    if ws and ws[0] != 'CUSTOM_PROPERTY':
-        ymake.report_configure_error('''Can't parse {}'''.format(ws))
-    custom_props = []
-    for item in ws:
-        if item == 'CUSTOM_PROPERTY':
-            custom_props.append([])
-        else:
-            custom_props[-1].append(item)
-    props = []
-    for p in custom_props:
-        if not p:
-            ymake.report_configure_error('Empty CUSTOM_PROPERTY')
-            continue
-        props.append('-B')
-        if len(p) > 1:
-            props.append(base64.b64encode("{}={}".format(p[0], ' '.join(p[1:]))))
-        else:
-            ymake.report_configure_error('CUSTOM_PROPERTY "{}" value is not specified'.format(p[0]))
-    for i, o in enumerate(outputs):
-        yield o, tepmlates[min(i, len(tepmlates) - 1)], props
-
-
-def on_ymake_generate_script(unit, *args):
-    for out, tmpl, props in parse_words(list(args)):
-        unit.on_add_gen_java_script([out, tmpl] + list(props))
+ 
+ 
+def on_add_java_style_checks(unit, *args): 
+    if unit.get('LINT_LEVEL_VALUE') != "none": 
+        unit.onadd_check(['JAVA_STYLE', unit.get('LINT_LEVEL_VALUE')] + list(args)) 
+ 
+ 
+def on_add_classpath_clash_check(unit, *args): 
+    jdeps_val = (unit.get('CHECK_JAVA_DEPS_VALUE') or '').lower() 
+    if jdeps_val and jdeps_val not in ('yes', 'no', 'strict'): 
+        ymake.report_configure_error('CHECK_JAVA_DEPS: "yes", "no" or "strict" required') 
+    if jdeps_val and jdeps_val != 'no': 
+        unit.onjava_test_deps(jdeps_val) 
+ 
+ 
+# Ymake java modules related macroses 
+ 
+ 
+def onexternal_jar(unit, *args): 
+    args = list(args) 
+    flat, kv = common.sort_by_keywords({'SOURCES': 1}, args) 
+    if not flat: 
+        ymake.report_configure_error('EXTERNAL_JAR requires exactly one resource URL of compiled jar library') 
+    res = flat[0] 
+    resid = res[4:] if res.startswith('sbr:') else res 
+    unit.set(['JAR_LIB_RESOURCE', resid]) 
+    unit.set(['JAR_LIB_RESOURCE_URL', res]) 
+ 
+ 
+def on_check_java_srcdir(unit, *args): 
+    args = list(args) 
+    for arg in args: 
+        if not '$' in arg: 
+            arc_srcdir = os.path.join(unit.get('MODDIR'), arg) 
+            abs_srcdir = unit.resolve(os.path.join("$S/", arc_srcdir)) 
+            if not os.path.exists(abs_srcdir) or not os.path.isdir(abs_srcdir): 
+                ymake.report_configure_error( 
+                    'Trying to set a [[alt1]]JAVA_SRCS[[rst]] for a missing directory: [[imp]]$S/{}[[rst]]', 
+                    missing_dir=arc_srcdir 
+                ) 
+            return 
+        srcdir = unit.resolve_arc_path(arg) 
+        if srcdir and not srcdir.startswith('$S'): 
+            continue 
+        abs_srcdir = unit.resolve(srcdir) if srcdir else unit.resolve(arg) 
+        if not os.path.exists(abs_srcdir) or not os.path.isdir(abs_srcdir): 
+            ymake.report_configure_error( 
+                'Trying to set a [[alt1]]JAVA_SRCS[[rst]] for a missing directory: [[imp]]{}[[rst]]', 
+                missing_dir=srcdir 
+            ) 
+ 
+ 
+def on_fill_jar_copy_resources_cmd(unit, *args): 
+    if len(args) == 4: 
+        varname, srcdir, base_classes_dir, reslist = tuple(args) 
+        package = '' 
+    else: 
+        varname, srcdir, base_classes_dir, package, reslist = tuple(args) 
+    dest_dir = os.path.join(base_classes_dir, *package.split('.')) if package else base_classes_dir 
+    var = unit.get(varname) 
+    var += ' && $FS_TOOLS copy_files {} {} {}'.format(srcdir if srcdir.startswith('"$') else '${CURDIR}/' + srcdir, dest_dir, reslist) 
+    unit.set([varname, var]) 
+ 
+def on_fill_jar_gen_srcs(unit, *args): 
+    varname, jar_type, srcdir, base_classes_dir, java_list, kt_list, groovy_list, res_list = tuple(args[0:8]) 
+    resolved_srcdir = unit.resolve_arc_path(srcdir) 
+    if not resolved_srcdir.startswith('$') or resolved_srcdir.startswith('$S'): 
+        return 
+ 
+    exclude_pos = args.index('EXCLUDE') 
+    globs = args[7:exclude_pos] 
+    excludes = args[exclude_pos + 1:] 
+    var = unit.get(varname) 
+    var += ' && ${{cwd:BINDIR}} $YMAKE_PYTHON ${{input:"build/scripts/resolve_java_srcs.py"}} --append -d {} -s {} -k {} -g {} -r {} --include-patterns {}'.format(srcdir, java_list, kt_list, groovy_list, res_list, ' '.join(globs)) 
+    if jar_type == 'SRC_JAR': 
+        var += ' --all-resources' 
+    if len(excludes) > 0: 
+        var += ' --exclude-patterns {}'.format(' '.join(excludes)) 
+    if unit.get('WITH_KOTLIN_VALUE') == 'yes': 
+        var += ' --resolve-kotlin' 
+    unit.set([varname, var]) 
+ 
+ 
+def on_check_run_java_prog_classpath(unit, *args): 
+    if len(args) != 1: 
+        ymake.report_configure_error('multiple CLASSPATH elements in RUN_JAVA_PROGRAM invocation no more supported. Use JAVA_RUNTIME_PEERDIR on the JAVA_PROGRAM module instead') 
+ 
+ 
+def extract_words(words, keys): 
+    kv = {} 
+    k = None 
+ 
+    for w in words: 
+        if w in keys: 
+            k = w 
+        else: 
+            if not k in kv: 
+                kv[k] = [] 
+            kv[k].append(w) 
+ 
+    return kv 
+ 
+ 
+def parse_words(words): 
+    kv = extract_words(words, {'OUT', 'TEMPLATE'}) 
+    ws = [] 
+    for item in ('OUT', 'TEMPLATE'): 
+        for i, word in list(enumerate(kv[item])): 
+            if word == 'CUSTOM_PROPERTY': 
+                ws += kv[item][i:] 
+                kv[item] = kv[item][:i] 
+    tepmlates = kv['TEMPLATE'] 
+    outputs = kv['OUT'] 
+    if len(outputs) < len(tepmlates): 
+        ymake.report_configure_error('To many arguments for TEMPLATE parameter') 
+        return 
+    if ws and ws[0] != 'CUSTOM_PROPERTY': 
+        ymake.report_configure_error('''Can't parse {}'''.format(ws)) 
+    custom_props = [] 
+    for item in ws: 
+        if item == 'CUSTOM_PROPERTY': 
+            custom_props.append([]) 
+        else: 
+            custom_props[-1].append(item) 
+    props = [] 
+    for p in custom_props: 
+        if not p: 
+            ymake.report_configure_error('Empty CUSTOM_PROPERTY') 
+            continue 
+        props.append('-B') 
+        if len(p) > 1: 
+            props.append(base64.b64encode("{}={}".format(p[0], ' '.join(p[1:])))) 
+        else: 
+            ymake.report_configure_error('CUSTOM_PROPERTY "{}" value is not specified'.format(p[0])) 
+    for i, o in enumerate(outputs): 
+        yield o, tepmlates[min(i, len(tepmlates) - 1)], props 
+ 
+ 
+def on_ymake_generate_script(unit, *args): 
+    for out, tmpl, props in parse_words(list(args)): 
+        unit.on_add_gen_java_script([out, tmpl] + list(props)) 
 
 def on_jdk_version_macro_check(unit, *args):
     if len(args) != 1:
diff --git a/build/plugins/res.py b/build/plugins/res.py
index a937caba81..ec8e2801f7 100644
--- a/build/plugins/res.py
+++ b/build/plugins/res.py
@@ -28,12 +28,12 @@ def split(lst, limit):
         yield bucket
 
 
-def remove_prefix(text, prefix):
-    if text.startswith(prefix):
-        return text[len(prefix):]
-    return text
-
-
+def remove_prefix(text, prefix): 
+    if text.startswith(prefix): 
+        return text[len(prefix):] 
+    return text 
+ 
+ 
 def onfat_resource(unit, *args):
     unit.onpeerdir(['library/cpp/resource'])
 
@@ -56,7 +56,7 @@ def onresource_files(unit, *args):
 
     This macro expands into
     RESOURCE([DONT_PARSE] {path} resfs/file/{prefix}{path}
-        - resfs/src/resfs/file/{prefix}{remove_prefix(path, prefix_to_strip)}={rootrel_arc_src(path)}
+        - resfs/src/resfs/file/{prefix}{remove_prefix(path, prefix_to_strip)}={rootrel_arc_src(path)} 
     )
 
     resfs/src/{key} stores a source root (or build root) relative path of the
@@ -74,7 +74,7 @@ def onresource_files(unit, *args):
     @see: https://wiki.yandex-team.ru/devtools/commandsandvars/resourcefiles/
     """
     prefix = ''
-    prefix_to_strip = None
+    prefix_to_strip = None 
     dest = None
     res = []
     first = 0
@@ -92,11 +92,11 @@ def onresource_files(unit, *args):
             prefix, dest = next(args), None
         elif arg == 'DEST':
             dest, prefix = next(args), None
-        elif arg == 'STRIP':
-            prefix_to_strip = next(args)
+        elif arg == 'STRIP': 
+            prefix_to_strip = next(args) 
         else:
             path = arg
-            key = 'resfs/file/' + (dest or (prefix + (path if not prefix_to_strip else remove_prefix(path, prefix_to_strip))))
+            key = 'resfs/file/' + (dest or (prefix + (path if not prefix_to_strip else remove_prefix(path, prefix_to_strip)))) 
             src = 'resfs/src/{}={}'.format(key, rootrel_arc_src(path, unit))
             res += ['-', src, path, key]
 
diff --git a/build/plugins/scarab_cant_clash.py b/build/plugins/scarab_cant_clash.py
index 77dc303183..a112a3220f 100644
--- a/build/plugins/scarab_cant_clash.py
+++ b/build/plugins/scarab_cant_clash.py
@@ -2,10 +2,10 @@ import _common as common
 
 
 def onacceleo(unit, *args):
-    if unit.get("YMAKE_JAVA_MODULES") == "yes":
-        return
+    if unit.get("YMAKE_JAVA_MODULES") == "yes": 
+        return 
     flat, kv = common.sort_by_keywords(
-        {'XSD': -1, 'MTL': -1, 'MTL_ROOT': 1, 'LANG': -1, 'OUT': -1, 'OUT_NOAUTO': -1, 'OUTPUT_INCLUDES': -1, 'DEBUG': 0},
+        {'XSD': -1, 'MTL': -1, 'MTL_ROOT': 1, 'LANG': -1, 'OUT': -1, 'OUT_NOAUTO': -1, 'OUTPUT_INCLUDES': -1, 'DEBUG': 0}, 
         args
     )
 
diff --git a/build/plugins/swig.py b/build/plugins/swig.py
index 32a37204a6..f90185bcaa 100644
--- a/build/plugins/swig.py
+++ b/build/plugins/swig.py
@@ -26,22 +26,22 @@ class Swig(iw.CustomCommand):
 
         self._swig_lang = unit.get('SWIG_LANG')
 
-        if self._swig_lang != 'jni_java':
-            self._main_out = os.path.join(
-                self._bindir,
-                '' if relpath == '.' else relpath.replace('..', '__'),
-                self._input_name + '_wrap.swg.c')
-
-            if not path.endswith('.c.swg'):
-                self._flags += ['-c++']
-                self._main_out += 'pp'
-
-        # lang_specific_incl_dir = 'perl5' if self._swig_lang == 'perl' else self._swig_lang
-        lang_specific_incl_dir = self._swig_lang
-        if self._swig_lang == 'perl':
-            lang_specific_incl_dir = 'perl5'
-        elif self._swig_lang in ['jni_cpp', 'jni_java']:
-            lang_specific_incl_dir = 'java'
+        if self._swig_lang != 'jni_java': 
+            self._main_out = os.path.join( 
+                self._bindir, 
+                '' if relpath == '.' else relpath.replace('..', '__'), 
+                self._input_name + '_wrap.swg.c') 
+ 
+            if not path.endswith('.c.swg'): 
+                self._flags += ['-c++'] 
+                self._main_out += 'pp' 
+ 
+        # lang_specific_incl_dir = 'perl5' if self._swig_lang == 'perl' else self._swig_lang 
+        lang_specific_incl_dir = self._swig_lang 
+        if self._swig_lang == 'perl': 
+            lang_specific_incl_dir = 'perl5' 
+        elif self._swig_lang in ['jni_cpp', 'jni_java']: 
+            lang_specific_incl_dir = 'java' 
         incl_dirs = [
             "FOR", "swig",
             posixpath.join(self._library_dir, lang_specific_incl_dir),
@@ -65,16 +65,16 @@ class Swig(iw.CustomCommand):
             self._flags.append('-shadow')
             unit.onpeerdir(['build/platform/perl'])
 
-        if self._swig_lang in ['jni_cpp', 'java']:
+        if self._swig_lang in ['jni_cpp', 'java']: 
             self._out_header = os.path.splitext(self._main_out)[0] + '.h'
             if (not unit.get('USE_SYSTEM_JDK')) and (unit.get('OS_ANDROID') != "yes"):
                 unit.onpeerdir(['contrib/libs/jdk'])
 
-        self._package = 'ru.yandex.' + os.path.dirname(self._path).replace('$S/', '').replace('$B/', '').replace('/', '.').replace('-', '_')
-        if self._swig_lang in ['jni_java', 'java']:
-            self._out_name = os.path.splitext(os.path.basename(self._path))[0] + '.jsrc'
-        elif self._swig_lang != 'jni_cpp':
-            self._flags.append('-' + self._swig_lang)
+        self._package = 'ru.yandex.' + os.path.dirname(self._path).replace('$S/', '').replace('$B/', '').replace('/', '.').replace('-', '_') 
+        if self._swig_lang in ['jni_java', 'java']: 
+            self._out_name = os.path.splitext(os.path.basename(self._path))[0] + '.jsrc' 
+        elif self._swig_lang != 'jni_cpp': 
+            self._flags.append('-' + self._swig_lang) 
 
     def descr(self):
         return 'SW', self._path, 'yellow'
@@ -91,23 +91,23 @@ class Swig(iw.CustomCommand):
         ]
 
     def output(self):
-        if self._swig_lang == 'jni_java':
-            return [(common.join_intl_paths(self._bindir, self._out_name), [])]
-        elif self._swig_lang == 'jni_cpp':
-            return [(self._main_out, []), (self._out_header, [])]
-
+        if self._swig_lang == 'jni_java': 
+            return [(common.join_intl_paths(self._bindir, self._out_name), [])] 
+        elif self._swig_lang == 'jni_cpp': 
+            return [(self._main_out, []), (self._out_header, [])] 
+ 
         return [
             (self._main_out, []),
             (common.join_intl_paths(self._bindir, self._out_name), (['noauto', 'add_to_outs'] if self._swig_lang != 'java' else [])),
         ] + ([(self._out_header, [])] if self._swig_lang == 'java' else [])
 
     def output_includes(self):
-        return [(self._out_header, [])] if self._swig_lang in ['java', 'jni_cpp'] else []
+        return [(self._out_header, [])] if self._swig_lang in ['java', 'jni_cpp'] else [] 
 
     def run(self, extra_args, binary):
         if self._local_swig:
             binary = self._tool
-        return self.do_run_java(binary, self._path) if self._swig_lang in ['java', 'jni_cpp', 'jni_java'] else self.do_run(binary, self._path)
+        return self.do_run_java(binary, self._path) if self._swig_lang in ['java', 'jni_cpp', 'jni_java'] else self.do_run(binary, self._path) 
 
     def _incl_flags(self):
         return ['-I' + self.resolve_path(x) for x in self._incl_dirs]
@@ -122,10 +122,10 @@ class Swig(iw.CustomCommand):
         import tarfile
 
         outdir = self.resolve_path(self._bindir)
-        if self._swig_lang != 'jni_cpp':
-            java_srcs_dir = os.path.join(outdir, self._package.replace('.', '/'))
-            if not os.path.exists(java_srcs_dir):
-                os.makedirs(java_srcs_dir)
+        if self._swig_lang != 'jni_cpp': 
+            java_srcs_dir = os.path.join(outdir, self._package.replace('.', '/')) 
+            if not os.path.exists(java_srcs_dir): 
+                os.makedirs(java_srcs_dir) 
 
         flags = self._incl_flags()
         src = self.resolve_path(path)
@@ -133,32 +133,32 @@ class Swig(iw.CustomCommand):
             if not re.search(r'(?m)^%module\b', f.read()):
                 flags += ['-module', os.path.splitext(os.path.basename(src))[0]]
 
-        if self._swig_lang == 'jni_cpp':
-            self.call([binary, '-c++', '-o', self._main_out, '-java', '-package', self._package] + flags + [src])
-        elif self._swig_lang == 'jni_java':
-            self.call([binary, '-c++', '-o', os.path.join(outdir, 'unused.cpp'), '-outdir', java_srcs_dir, '-java', '-package', self._package] + flags + [src])
-        elif self._swig_lang == 'java':
-            self.call([
-                binary, '-c++', '-o', self._main_out, '-outdir', java_srcs_dir,
-                '-java', '-package', self._package,
-            ] + flags + [src])
-
-        if self._swig_lang in ['jni_java', 'java']:
-            with tarfile.open(os.path.join(outdir, self._out_name), 'a') as tf:
-                tf.add(java_srcs_dir, arcname=self._package.replace('.', '/'))
-
-        if self._swig_lang in ['jni_cpp', 'java']:
-            header = os.path.splitext(self.resolve_path(self._main_out))[0] + '.h'
-            if not os.path.exists(header):
-                open(header, 'w').close()
-
-
-def on_swig_lang_filtered_srcs(unit, *args):
-    swig_lang = unit.get('SWIG_LANG')
-    allowed_exts = set()
-    if swig_lang == 'jni_cpp':
-        allowed_exts = set(['.cpp', '.swg'])
-    if swig_lang == 'jni_java':
-        allowed_exts = set(['.java', '.swg'])
-    args = [arg for arg in iter(args) if allowed_exts and os.path.splitext(arg)[1] in allowed_exts]
-    unit.onsrcs(args)
+        if self._swig_lang == 'jni_cpp': 
+            self.call([binary, '-c++', '-o', self._main_out, '-java', '-package', self._package] + flags + [src]) 
+        elif self._swig_lang == 'jni_java': 
+            self.call([binary, '-c++', '-o', os.path.join(outdir, 'unused.cpp'), '-outdir', java_srcs_dir, '-java', '-package', self._package] + flags + [src]) 
+        elif self._swig_lang == 'java': 
+            self.call([ 
+                binary, '-c++', '-o', self._main_out, '-outdir', java_srcs_dir, 
+                '-java', '-package', self._package, 
+            ] + flags + [src]) 
+
+        if self._swig_lang in ['jni_java', 'java']: 
+            with tarfile.open(os.path.join(outdir, self._out_name), 'a') as tf: 
+                tf.add(java_srcs_dir, arcname=self._package.replace('.', '/')) 
+
+        if self._swig_lang in ['jni_cpp', 'java']: 
+            header = os.path.splitext(self.resolve_path(self._main_out))[0] + '.h' 
+            if not os.path.exists(header): 
+                open(header, 'w').close() 
+ 
+ 
+def on_swig_lang_filtered_srcs(unit, *args): 
+    swig_lang = unit.get('SWIG_LANG') 
+    allowed_exts = set() 
+    if swig_lang == 'jni_cpp': 
+        allowed_exts = set(['.cpp', '.swg']) 
+    if swig_lang == 'jni_java': 
+        allowed_exts = set(['.java', '.swg']) 
+    args = [arg for arg in iter(args) if allowed_exts and os.path.splitext(arg)[1] in allowed_exts] 
+    unit.onsrcs(args) 
diff --git a/build/plugins/ytest.py b/build/plugins/ytest.py
index 8970837f0f..27460b35e5 100644
--- a/build/plugins/ytest.py
+++ b/build/plugins/ytest.py
@@ -524,25 +524,25 @@ def onadd_ytest(unit, *args):
         save_in_file(unit.get('TEST_DART_OUT_FILE'), data)
 
 
-def java_srcdirs_to_data(unit, var):
-    extra_data = []
-    for srcdir in (unit.get(var) or '').replace('$' + var, '').split():
-        if srcdir == '.':
-            srcdir = unit.get('MODDIR')
-        if srcdir.startswith('${ARCADIA_ROOT}/') or srcdir.startswith('$ARCADIA_ROOT/'):
-            srcdir = srcdir.replace('${ARCADIA_ROOT}/', '$S/')
-            srcdir = srcdir.replace('$ARCADIA_ROOT/', '$S/')
-        if srcdir.startswith('${CURDIR}/') or srcdir.startswith('$CURDIR/'):
-            srcdir = srcdir.replace('${CURDIR}/', os.path.join('$S', unit.get('MODDIR')))
-            srcdir = srcdir.replace('$CURDIR/', os.path.join('$S', unit.get('MODDIR')))
-        srcdir = unit.resolve_arc_path(srcdir)
-        if not srcdir.startswith('$'):
-            srcdir = os.path.join('$S', unit.get('MODDIR'), srcdir)
-        if srcdir.startswith('$S'):
-            extra_data.append(srcdir.replace('$S', 'arcadia'))
-    return serialize_list(extra_data)
-
-
+def java_srcdirs_to_data(unit, var): 
+    extra_data = [] 
+    for srcdir in (unit.get(var) or '').replace('$' + var, '').split(): 
+        if srcdir == '.': 
+            srcdir = unit.get('MODDIR') 
+        if srcdir.startswith('${ARCADIA_ROOT}/') or srcdir.startswith('$ARCADIA_ROOT/'): 
+            srcdir = srcdir.replace('${ARCADIA_ROOT}/', '$S/') 
+            srcdir = srcdir.replace('$ARCADIA_ROOT/', '$S/') 
+        if srcdir.startswith('${CURDIR}/') or srcdir.startswith('$CURDIR/'): 
+            srcdir = srcdir.replace('${CURDIR}/', os.path.join('$S', unit.get('MODDIR'))) 
+            srcdir = srcdir.replace('$CURDIR/', os.path.join('$S', unit.get('MODDIR'))) 
+        srcdir = unit.resolve_arc_path(srcdir) 
+        if not srcdir.startswith('$'): 
+            srcdir = os.path.join('$S', unit.get('MODDIR'), srcdir) 
+        if srcdir.startswith('$S'): 
+            extra_data.append(srcdir.replace('$S', 'arcadia')) 
+    return serialize_list(extra_data) 
+ 
+ 
 def onadd_check(unit, *args):
     if unit.get("TIDY") == "yes":
         # graph changed for clang_tidy tests
@@ -554,16 +554,16 @@ def onadd_check(unit, *args):
 
     test_timeout = ''
     fork_mode = ''
-    extra_test_data = ''
+    extra_test_data = '' 
     extra_test_dart_data = {}
-    ymake_java_test = unit.get('YMAKE_JAVA_TEST') == 'yes'
+    ymake_java_test = unit.get('YMAKE_JAVA_TEST') == 'yes' 
 
     if check_type in ["flake8.py2", "flake8.py3"]:
         script_rel_path = check_type
         fork_mode = unit.get('TEST_FORK_MODE') or ''
     elif check_type == "JAVA_STYLE":
-        if ymake_java_test and not unit.get('ALL_SRCDIRS') or '':
-            return
+        if ymake_java_test and not unit.get('ALL_SRCDIRS') or '': 
+            return 
         if len(flat_args) < 2:
             raise Exception("Not enough arguments for JAVA_STYLE check")
         check_level = flat_args[1]
@@ -576,13 +576,13 @@ def onadd_check(unit, *args):
         if check_level not in allowed_levels:
             raise Exception('{} is not allowed in LINT(), use one of {}'.format(check_level, allowed_levels.keys()))
         flat_args[1] = allowed_levels[check_level]
-        if check_level == 'none':
-            return
+        if check_level == 'none': 
+            return 
         script_rel_path = "java.style"
         test_timeout = '120'
         fork_mode = unit.get('TEST_FORK_MODE') or ''
-        if ymake_java_test:
-            extra_test_data = java_srcdirs_to_data(unit, 'ALL_SRCDIRS')
+        if ymake_java_test: 
+            extra_test_data = java_srcdirs_to_data(unit, 'ALL_SRCDIRS') 
         extra_test_dart_data['JDK_RESOURCE'] = 'JDK' + (unit.get('JDK_VERSION') or '_DEFAULT')
     elif check_type == "gofmt":
         script_rel_path = check_type
@@ -620,7 +620,7 @@ def onadd_check(unit, *args):
         'TESTED-PROJECT-NAME': os.path.basename(test_dir),
         'SOURCE-FOLDER-PATH': test_dir,
         'CUSTOM-DEPENDENCIES': " ".join(spec_args.get('DEPENDS', [])),
-        'TEST-DATA': extra_test_data,
+        'TEST-DATA': extra_test_data, 
         "SBR-UID-EXT": uid_ext,
         'SPLIT-FACTOR': '',
         'TEST_PARTITION': 'SEQUENTIAL',
@@ -635,7 +635,7 @@ def onadd_check(unit, *args):
         # TODO remove FILES, see DEVTOOLS-7052
         'FILES': test_files,
         'TEST-FILES': test_files,
-        'NO_JBUILD': 'yes' if ymake_java_test else 'no',
+        'NO_JBUILD': 'yes' if ymake_java_test else 'no', 
     }
     test_record.update(extra_test_dart_data)
 
@@ -836,7 +836,7 @@ def onjava_test(unit, *args):
     else:
         script_rel_path = 'junit.test'
 
-    ymake_java_test = unit.get('YMAKE_JAVA_TEST') == 'yes'
+    ymake_java_test = unit.get('YMAKE_JAVA_TEST') == 'yes' 
     test_record = {
         'SOURCE-FOLDER-PATH': path,
         'TEST-NAME': '-'.join([os.path.basename(os.path.dirname(path)), os.path.basename(path)]),
@@ -861,22 +861,22 @@ def onjava_test(unit, *args):
         'SYSTEM_PROPERTIES': props,
         'TEST-CWD': test_cwd,
         'SKIP_TEST': unit.get('SKIP_TEST_VALUE') or '',
-        'JAVA_CLASSPATH_CMD_TYPE': java_cp_arg_type,
+        'JAVA_CLASSPATH_CMD_TYPE': java_cp_arg_type, 
         'NO_JBUILD': 'yes' if ymake_java_test else 'no',
         'JDK_RESOURCE': 'JDK' + (unit.get('JDK_VERSION') or '_DEFAULT'),
         'JDK_FOR_TESTS': 'JDK' + (unit.get('JDK_VERSION') or '_DEFAULT') + '_FOR_TESTS',
     }
-    test_classpath_origins = unit.get('TEST_CLASSPATH_VALUE')
-    if test_classpath_origins:
-        test_record['TEST_CLASSPATH_ORIGINS'] = test_classpath_origins
-        test_record['TEST_CLASSPATH'] = '${TEST_CLASSPATH_MANAGED}'
-    elif ymake_java_test:
-        test_record['TEST_CLASSPATH'] = '${DART_CLASSPATH}'
-        test_record['TEST_CLASSPATH_DEPS'] = '${DART_CLASSPATH_DEPS}'
-        if unit.get('UNITTEST_DIR'):
-            test_record['TEST_JAR'] = '${UNITTEST_MOD}'
-        else:
-            test_record['TEST_JAR'] = '{}/{}.jar'.format(unit.get('MODDIR'), unit.get('REALPRJNAME'))
+    test_classpath_origins = unit.get('TEST_CLASSPATH_VALUE') 
+    if test_classpath_origins: 
+        test_record['TEST_CLASSPATH_ORIGINS'] = test_classpath_origins 
+        test_record['TEST_CLASSPATH'] = '${TEST_CLASSPATH_MANAGED}' 
+    elif ymake_java_test: 
+        test_record['TEST_CLASSPATH'] = '${DART_CLASSPATH}' 
+        test_record['TEST_CLASSPATH_DEPS'] = '${DART_CLASSPATH_DEPS}' 
+        if unit.get('UNITTEST_DIR'): 
+            test_record['TEST_JAR'] = '${UNITTEST_MOD}' 
+        else: 
+            test_record['TEST_JAR'] = '{}/{}.jar'.format(unit.get('MODDIR'), unit.get('REALPRJNAME')) 
 
     data = dump_test(unit, test_record)
     if data:
@@ -893,7 +893,7 @@ def onjava_test_deps(unit, *args):
     mode = args[0]
 
     path = get_norm_unit_path(unit)
-    ymake_java_test = unit.get('YMAKE_JAVA_TEST') == 'yes'
+    ymake_java_test = unit.get('YMAKE_JAVA_TEST') == 'yes' 
 
     test_record = {
         'SOURCE-FOLDER-PATH': path,
@@ -909,7 +909,7 @@ def onjava_test_deps(unit, *args):
         'TAG': '',
         'SIZE': 'SMALL',
         'IGNORE_CLASSPATH_CLASH': ' '.join(get_values_list(unit, 'JAVA_IGNORE_CLASSPATH_CLASH_VALUE')),
-        'NO_JBUILD': 'yes' if ymake_java_test else 'no',
+        'NO_JBUILD': 'yes' if ymake_java_test else 'no', 
 
         # JTEST/JTEST_FOR only
         'MODULE_TYPE': unit.get('MODULE_TYPE'),
@@ -920,9 +920,9 @@ def onjava_test_deps(unit, *args):
     if mode == 'strict':
         test_record['STRICT_CLASSPATH_CLASH'] = 'yes'
 
-    if ymake_java_test:
-        test_record['CLASSPATH'] = '$B/{}/{}.jar ${{DART_CLASSPATH}}'.format(unit.get('MODDIR'), unit.get('REALPRJNAME'))
-
+    if ymake_java_test: 
+        test_record['CLASSPATH'] = '$B/{}/{}.jar ${{DART_CLASSPATH}}'.format(unit.get('MODDIR'), unit.get('REALPRJNAME')) 
+ 
     data = dump_test(unit, test_record)
     unit.set_property(['DART_DATA', data])
 
diff --git a/build/rules/contrib_deps.policy b/build/rules/contrib_deps.policy
index 9af4b85cc2..9272fb5259 100644
--- a/build/rules/contrib_deps.policy
+++ b/build/rules/contrib_deps.policy
@@ -1,6 +1,6 @@
 ALLOW contrib/clickhouse -> library/cpp/consistent_hashing
-ALLOW contrib -> contrib
-ALLOW contrib -> build
+ALLOW contrib -> contrib 
+ALLOW contrib -> build 
 ALLOW contrib -> library/python/resource
 ALLOW contrib -> library/cpp/testing/unittest_main
 ALLOW contrib -> library/cpp/testing/unittest
@@ -8,50 +8,50 @@ ALLOW contrib -> library/cpp/getopt
 ALLOW contrib -> library/cpp/resource
 ALLOW contrib -> library/cpp/charset
 ALLOW contrib -> library/cpp/svnversion
-ALLOW contrib -> certs
-ALLOW contrib/libs/.*/ut -> library
-ALLOW contrib/java/.*/ut -> devtools/jtest
-ALLOW contrib/java/.*/ut -> devtools/junit-runner
-ALLOW contrib/java/.*/ut -> devtools/junit5-runner
-ALLOW contrib/python -> library/python/resource
-ALLOW contrib/tools/cython/Cython -> library/python/resource
-ALLOW contrib/libs/python -> library/python/symbols/module
-ALLOW contrib/libs/python -> library/python/symbols/uuid
-ALLOW contrib/libs/python -> library/python/symbols/python
-ALLOW contrib/libs/python -> library/python/symbols/libc
-ALLOW contrib/libs/python -> library/python/runtime
-ALLOW contrib/libs/python -> library/python/runtime_py3
-ALLOW contrib/tools/python3/pycc -> library/python/runtime_py3
-ALLOW contrib/python/.*/(_?)test(s?) -> library/python/testing/yatest_common
-ALLOW contrib/python/.*/(_?)test(s?) -> library/python/import_test
-ALLOW contrib/python/click -> library/python/symbols/python
-ALLOW contrib/java/ru/yandex/market -> (market)|(maps/doc/proto/yandex/maps/proto)
-ALLOW contrib/libs/tf -> library/python/testing/gtest
-ALLOW contrib/libs/tf/tests/test_vars_to_const/cpp_check_inference -> maps/libs/common
-ALLOW contrib/libs/tf/tests/test_vars_to_const/cpp_check_inference -> yandex/maps/common
+ALLOW contrib -> certs 
+ALLOW contrib/libs/.*/ut -> library 
+ALLOW contrib/java/.*/ut -> devtools/jtest 
+ALLOW contrib/java/.*/ut -> devtools/junit-runner 
+ALLOW contrib/java/.*/ut -> devtools/junit5-runner 
+ALLOW contrib/python -> library/python/resource 
+ALLOW contrib/tools/cython/Cython -> library/python/resource 
+ALLOW contrib/libs/python -> library/python/symbols/module 
+ALLOW contrib/libs/python -> library/python/symbols/uuid 
+ALLOW contrib/libs/python -> library/python/symbols/python 
+ALLOW contrib/libs/python -> library/python/symbols/libc 
+ALLOW contrib/libs/python -> library/python/runtime 
+ALLOW contrib/libs/python -> library/python/runtime_py3 
+ALLOW contrib/tools/python3/pycc -> library/python/runtime_py3 
+ALLOW contrib/python/.*/(_?)test(s?) -> library/python/testing/yatest_common 
+ALLOW contrib/python/.*/(_?)test(s?) -> library/python/import_test 
+ALLOW contrib/python/click -> library/python/symbols/python 
+ALLOW contrib/java/ru/yandex/market -> (market)|(maps/doc/proto/yandex/maps/proto) 
+ALLOW contrib/libs/tf -> library/python/testing/gtest 
+ALLOW contrib/libs/tf/tests/test_vars_to_const/cpp_check_inference -> maps/libs/common 
+ALLOW contrib/libs/tf/tests/test_vars_to_const/cpp_check_inference -> yandex/maps/common 
 ALLOW contrib/restricted/libtorrent -> maps/libs/fastbone
-ALLOW contrib/python/transfer_manager_client -> transfer_manager/client
-ALLOW contrib/(deprecated/)?python/django -> library/python/django
-ALLOW contrib/(deprecated/)?python/django -> library/python/gunicorn
-ALLOW contrib/python/python-magic -> library/python/symbols/libmagic
+ALLOW contrib/python/transfer_manager_client -> transfer_manager/client 
+ALLOW contrib/(deprecated/)?python/django -> library/python/django 
+ALLOW contrib/(deprecated/)?python/django -> library/python/gunicorn 
+ALLOW contrib/python/python-magic -> library/python/symbols/libmagic 
 ALLOW contrib/python/typecode -> library/python/symbols/libmagic
-ALLOW contrib/tools/jdk/test -> devtools/ya/yalibrary/tools
+ALLOW contrib/tools/jdk/test -> devtools/ya/yalibrary/tools 
 ALLOW contrib/libs/clang12/tools/extra/clang-tidy/tool -> library/cpp/clang_tidy
 ALLOW contrib/libs/inja -> library/cpp/scheme
-ALLOW contrib/libs/geos/capi/ctypes -> library/python/ctypes
+ALLOW contrib/libs/geos/capi/ctypes -> library/python/ctypes 
 ALLOW contrib/libs/leveldb -> library/cpp/deprecated/mapped_file
 ALLOW contrib/libs/leveldb -> library/cpp/logger
 ALLOW contrib/libs/leveldb -> library/cpp/digest/crc32c
 ALLOW contrib/libs/lua -> library/cpp/archive
 ALLOW contrib/libs/phonedetect/src -> library/cpp/digest/md5
 ALLOW contrib/python/certifi -> library/python/certifi
-ALLOW contrib/python/horovod/horovod/common/syms -> library/python/symbols/registry
+ALLOW contrib/python/horovod/horovod/common/syms -> library/python/symbols/registry 
 ALLOW contrib/python/opensfm -> library/cpp/vl_feat
 ALLOW contrib/python/Wand/ImageMagick -> library/python/symbols/registry
 ALLOW contrib/nginx/modules/nginx-rtmp-module -> library/cpp/json
 ALLOW contrib/python/gino -> library/python/pyscopg2
-ALLOW contrib/python/psycopg2/tests -> mail/devpack
-ALLOW contrib/python/asn1crypto -> library/python/symbols/crypto
+ALLOW contrib/python/psycopg2/tests -> mail/devpack 
+ALLOW contrib/python/asn1crypto -> library/python/symbols/crypto 
 ALLOW contrib/python/win_unicode_console -> library/python/symbols/win_unicode_console
 ALLOW contrib/python/pycryptodome -> library/python/symbols/registry
 
diff --git a/build/rules/contrib_python.policy b/build/rules/contrib_python.policy
index 60fd149753..942c439d7c 100644
--- a/build/rules/contrib_python.policy
+++ b/build/rules/contrib_python.policy
@@ -84,24 +84,24 @@ ALLOW yaphone/dialer/project -> contrib/python/django/django-1.11
 ALLOW yaphone/utils/geo -> contrib/python/django/django-1.11
 DENY .* -> contrib/python/django/django-1.11
 
-ALLOW maps -> maps/contrib
-DENY .* -> maps/contrib
-
+ALLOW maps -> maps/contrib 
+DENY .* -> maps/contrib 
+ 
 ALLOW contrib/deprecated/python/ruamel.ordereddict/tests -> contrib/deprecated/python/ruamel.ordereddict
 ALLOW contrib/python/ruamel.yaml -> contrib/deprecated/python/ruamel.ordereddict
 DENY .* -> contrib/deprecated/python/ruamel.ordereddict
 
-ALLOW vcs/hg/server -> contrib/deprecated/python/hgsubversion
+ALLOW vcs/hg/server -> contrib/deprecated/python/hgsubversion 
 DENY .* -> contrib/deprecated/python/hgsubversion
 
-ALLOW sandbox/projects/CompareYmakeDump -> contrib/deprecated/python/diff2html
-ALLOW sandbox/projects/antirobot/DiffResources -> contrib/deprecated/python/diff2html
-ALLOW yql/udfs/common/python/python_arc -> contrib/deprecated/python/diff2html
+ALLOW sandbox/projects/CompareYmakeDump -> contrib/deprecated/python/diff2html 
+ALLOW sandbox/projects/antirobot/DiffResources -> contrib/deprecated/python/diff2html 
+ALLOW yql/udfs/common/python/python_arc -> contrib/deprecated/python/diff2html 
 DENY .* -> contrib/deprecated/python/diff2html
 
 # Sophos SDK and engine are distributed under proprietary license hence
 # usage restriction
-ALLOW yweb/antimalware/ -> contrib/libs/sophos
+ALLOW yweb/antimalware/ -> contrib/libs/sophos 
 DENY .* -> contrib/libs/sophos
 
 # contrib/python/backports should not be used in new projects because we want
@@ -111,55 +111,55 @@ DENY .* ->  contrib/python/backports.weakref
 
 ALLOW contrib/python/thrift/tests -> contrib/python/thrift
 ALLOW contrib/python/jaeger-client -> contrib/python/thrift
-ALLOW search/mon/wabbajack/libs/generated/iss3 -> contrib/python/thrift
-ALLOW search/mon/wabbajack/libs/modlib/api_wrappers/casher -> contrib/python/thrift
+ALLOW search/mon/wabbajack/libs/generated/iss3 -> contrib/python/thrift 
+ALLOW search/mon/wabbajack/libs/modlib/api_wrappers/casher -> contrib/python/thrift 
 DENY .* -> contrib/python/thrift
 
-ALLOW antiadblock/libs/tornado_redis -> contrib/python/toredis
-ALLOW yabs/amazon/cache_proxy -> contrib/python/toredis
-ALLOW yql/udfs/common/python/python_arc -> contrib/python/toredis
+ALLOW antiadblock/libs/tornado_redis -> contrib/python/toredis 
+ALLOW yabs/amazon/cache_proxy -> contrib/python/toredis 
+ALLOW yql/udfs/common/python/python_arc -> contrib/python/toredis 
 DENY .* -> contrib/python/toredis
 
 # contrib/python/MySQL-python dosen't support Python 3, use mysqlclient-python
 # or pymysql instead of this.
-ALLOW adfox/amacs/tests/functional/libs/builders -> contrib/python/MySQL-python
-ALLOW adfox/amacs/tests/functional/libs/config -> contrib/python/MySQL-python
-ALLOW adfox/amacs/tests/functional/libs/db -> contrib/python/MySQL-python
-ALLOW adfox/amacs/tests/functional/libs/marshaller -> contrib/python/MySQL-python
-ALLOW adfox/amacs/tests/functional/libs/models -> contrib/python/MySQL-python
-ALLOW adfox/amacs/tests/functional/utils -> contrib/python/MySQL-python
-ALLOW adfox/rtd/reports -> contrib/python/MySQL-python
-ALLOW adfox/samogon/servants/monitoring/uniques_monitoring -> contrib/python/MySQL-python
-ALLOW ads/bsyeti/bb_viewer/viewer -> contrib/python/MySQL-python
-ALLOW ads/libs/py_core -> contrib/python/MySQL-python
-ALLOW ads/ml_monitoring/alerts/lib -> contrib/python/MySQL-python
-ALLOW ads/ml_monitoring/lib/mysql -> contrib/python/MySQL-python
-ALLOW april/badb -> contrib/python/MySQL-python
+ALLOW adfox/amacs/tests/functional/libs/builders -> contrib/python/MySQL-python 
+ALLOW adfox/amacs/tests/functional/libs/config -> contrib/python/MySQL-python 
+ALLOW adfox/amacs/tests/functional/libs/db -> contrib/python/MySQL-python 
+ALLOW adfox/amacs/tests/functional/libs/marshaller -> contrib/python/MySQL-python 
+ALLOW adfox/amacs/tests/functional/libs/models -> contrib/python/MySQL-python 
+ALLOW adfox/amacs/tests/functional/utils -> contrib/python/MySQL-python 
+ALLOW adfox/rtd/reports -> contrib/python/MySQL-python 
+ALLOW adfox/samogon/servants/monitoring/uniques_monitoring -> contrib/python/MySQL-python 
+ALLOW ads/bsyeti/bb_viewer/viewer -> contrib/python/MySQL-python 
+ALLOW ads/libs/py_core -> contrib/python/MySQL-python 
+ALLOW ads/ml_monitoring/alerts/lib -> contrib/python/MySQL-python 
+ALLOW ads/ml_monitoring/lib/mysql -> contrib/python/MySQL-python 
+ALLOW april/badb -> contrib/python/MySQL-python 
 ALLOW contrib/python/MySQL-python/test -> contrib/python/MySQL-python
 ALLOW contrib/python/MySQL-python -> contrib/python/MySQL-python
-ALLOW dict/ontodb/tools/fields_diff/lib -> contrib/python/MySQL-python
-ALLOW maps/streetview/backoffice/lib -> contrib/python/MySQL-python
-ALLOW market/sre/tools/cs_mysql_monitoring/mysql_monitoring -> contrib/python/MySQL-python
-ALLOW metrika/core/monitoring/mobile-logs-api-export-generator-check -> contrib/python/MySQL-python
+ALLOW dict/ontodb/tools/fields_diff/lib -> contrib/python/MySQL-python 
+ALLOW maps/streetview/backoffice/lib -> contrib/python/MySQL-python 
+ALLOW market/sre/tools/cs_mysql_monitoring/mysql_monitoring -> contrib/python/MySQL-python 
+ALLOW metrika/core/monitoring/mobile-logs-api-export-generator-check -> contrib/python/MySQL-python 
 ALLOW passport/backend/social -> contrib/python/MySQL-python
 ALLOW passport/infra/daemons/yasmsapi/db -> contrib/python/MySQL-python
-ALLOW testenv/core -> contrib/python/MySQL-python
-ALLOW testenv/recipes/ut -> contrib/python/MySQL-python
-# avia task to migrate from MySQL-python https://st.yandex-team.ru/RASPTICKETS-18201
+ALLOW testenv/core -> contrib/python/MySQL-python 
+ALLOW testenv/recipes/ut -> contrib/python/MySQL-python 
+# avia task to migrate from MySQL-python https://st.yandex-team.ru/RASPTICKETS-18201 
 ALLOW travel/avia/.* -> contrib/python/MySQL-python
-ALLOW travel/library/recipe_utils -> contrib/python/MySQL-python
-ALLOW travel/rasp/admin -> contrib/python/MySQL-python
-ALLOW travel/rasp/library/common -> contrib/python/MySQL-python
-ALLOW travel/rasp/library/python/common -> contrib/python/MySQL-python
-ALLOW travel/rasp/library/common_recipe -> contrib/python/MySQL-python
-ALLOW travel/rasp/mysql_dumper/lib -> contrib/python/MySQL-python
-ALLOW trust/emulator/servant -> contrib/python/MySQL-python
-ALLOW yabs/qa/yabs_b2b_tank/qabs/b2b -> contrib/python/MySQL-python
-ALLOW yabs/server/test/tools/lua_test_generator -> contrib/python/MySQL-python
-ALLOW yabs/server/tools/debug_cookie_mysql -> contrib/python/MySQL-python
-ALLOW yweb/antimalware/visual_html_parser/yandex-search-antivirus-common -> contrib/python/MySQL-python
-ALLOW yweb/news/news_back/api/scripts/migrate_scripts_common -> contrib/python/MySQL-python
-ALLOW yweb/news/support/viewer -> contrib/python/MySQL-python
+ALLOW travel/library/recipe_utils -> contrib/python/MySQL-python 
+ALLOW travel/rasp/admin -> contrib/python/MySQL-python 
+ALLOW travel/rasp/library/common -> contrib/python/MySQL-python 
+ALLOW travel/rasp/library/python/common -> contrib/python/MySQL-python 
+ALLOW travel/rasp/library/common_recipe -> contrib/python/MySQL-python 
+ALLOW travel/rasp/mysql_dumper/lib -> contrib/python/MySQL-python 
+ALLOW trust/emulator/servant -> contrib/python/MySQL-python 
+ALLOW yabs/qa/yabs_b2b_tank/qabs/b2b -> contrib/python/MySQL-python 
+ALLOW yabs/server/test/tools/lua_test_generator -> contrib/python/MySQL-python 
+ALLOW yabs/server/tools/debug_cookie_mysql -> contrib/python/MySQL-python 
+ALLOW yweb/antimalware/visual_html_parser/yandex-search-antivirus-common -> contrib/python/MySQL-python 
+ALLOW yweb/news/news_back/api/scripts/migrate_scripts_common -> contrib/python/MySQL-python 
+ALLOW yweb/news/support/viewer -> contrib/python/MySQL-python 
 DENY .* -> contrib/python/MySQL-python
 
 ALLOW contrib/deprecated/python/mipp/tests -> contrib/deprecated/python/mipp
@@ -175,25 +175,25 @@ DENY .* -> contrib/python/pdbpp
 ALLOW contrib/python/pdbpp -> contrib/python/fancycompleter
 DENY .* -> contrib/python/fancycompleter
 
-ALLOW infra/procman -> contrib/python/skynet_pyro4
-ALLOW skynet -> contrib/python/skynet_pyro4
+ALLOW infra/procman -> contrib/python/skynet_pyro4 
+ALLOW skynet -> contrib/python/skynet_pyro4 
 DENY .* -> contrib/python/skynet_pyro4
 
 ALLOW contrib/deprecated/python/cyordereddict -> contrib/deprecated/python/cyordereddict
 ALLOW contrib/deprecated/python/cyordereddict/cyordereddict/tests -> contrib/deprecated/python/cyordereddict
-ALLOW infra/awacs/vendor/awacs -> contrib/deprecated/python/cyordereddict
-ALLOW juggler/juggler_client/jclient -> contrib/deprecated/python/cyordereddict
-ALLOW juggler/juggler_client -> contrib/deprecated/python/cyordereddict
-ALLOW juggler/libjuggler -> contrib/deprecated/python/cyordereddict
-ALLOW juggler/netmon/agent/agent -> contrib/deprecated/python/cyordereddict
-ALLOW mail/python/huge_py2 -> contrib/deprecated/python/cyordereddict
-ALLOW sprav/protos/model -> contrib/deprecated/python/cyordereddict
-ALLOW yql/udfs/common/python/python_arc -> contrib/deprecated/python/cyordereddict
+ALLOW infra/awacs/vendor/awacs -> contrib/deprecated/python/cyordereddict 
+ALLOW juggler/juggler_client/jclient -> contrib/deprecated/python/cyordereddict 
+ALLOW juggler/juggler_client -> contrib/deprecated/python/cyordereddict 
+ALLOW juggler/libjuggler -> contrib/deprecated/python/cyordereddict 
+ALLOW juggler/netmon/agent/agent -> contrib/deprecated/python/cyordereddict 
+ALLOW mail/python/huge_py2 -> contrib/deprecated/python/cyordereddict 
+ALLOW sprav/protos/model -> contrib/deprecated/python/cyordereddict 
+ALLOW yql/udfs/common/python/python_arc -> contrib/deprecated/python/cyordereddict 
 DENY .* -> contrib/deprecated/python/cyordereddict
 
 ALLOW contrib/deprecated/python/xmpppy -> contrib/deprecated/python/xmpppy
-ALLOW ads/libs/py_notifier -> contrib/deprecated/python/xmpppy
-ALLOW yql/udfs/common/python/python_arc -> contrib/deprecated/python/xmpppy
+ALLOW ads/libs/py_notifier -> contrib/deprecated/python/xmpppy 
+ALLOW yql/udfs/common/python/python_arc -> contrib/deprecated/python/xmpppy 
 DENY .* -> contrib/deprecated/python/xmpppy
 
 ALLOW contrib/python/fancycompleter -> contrib/python/pyrepl
@@ -203,42 +203,42 @@ DENY .* -> contrib/python/pyrepl
 ALLOW .* -> contrib/python/pycryptodome
 # pycrypto deprecated
 ALLOW intranet/domenator/src -> contrib/python/pycrypto
-ALLOW intranet/yandex_directory/src -> contrib/python/pycrypto
-ALLOW addappter/backend -> contrib/python/pycrypto
-ALLOW adfox -> contrib/python/pycrypto
-ALLOW alice/vins/api -> contrib/python/pycrypto
-ALLOW antiadblock/cryprox/cryprox -> contrib/python/pycrypto
-ALLOW balancer/test/functional/aab_cookie_verify -> contrib/python/pycrypto
-ALLOW billing/balance_utils -> contrib/python/pycrypto
-ALLOW billing/balance_utils/tests -> contrib/python/pycrypto
-ALLOW billing/snout/yb_snout_api -> contrib/python/pycrypto
-ALLOW crypta -> contrib/python/pycrypto
-ALLOW devtools/experimental/addappter/addappter -> contrib/python/pycrypto
-ALLOW direct/infra/direct-utils/direct-apps-juggler/share/direct-apps-juggler/sandbox/common -> contrib/python/pycrypto
-ALLOW infra/cqudp -> contrib/python/pycrypto
-ALLOW infra/portoshell -> contrib/python/pycrypto
+ALLOW intranet/yandex_directory/src -> contrib/python/pycrypto 
+ALLOW addappter/backend -> contrib/python/pycrypto 
+ALLOW adfox -> contrib/python/pycrypto 
+ALLOW alice/vins/api -> contrib/python/pycrypto 
+ALLOW antiadblock/cryprox/cryprox -> contrib/python/pycrypto 
+ALLOW balancer/test/functional/aab_cookie_verify -> contrib/python/pycrypto 
+ALLOW billing/balance_utils -> contrib/python/pycrypto 
+ALLOW billing/balance_utils/tests -> contrib/python/pycrypto 
+ALLOW billing/snout/yb_snout_api -> contrib/python/pycrypto 
+ALLOW crypta -> contrib/python/pycrypto 
+ALLOW devtools/experimental/addappter/addappter -> contrib/python/pycrypto 
+ALLOW direct/infra/direct-utils/direct-apps-juggler/share/direct-apps-juggler/sandbox/common -> contrib/python/pycrypto 
+ALLOW infra/cqudp -> contrib/python/pycrypto 
+ALLOW infra/portoshell -> contrib/python/pycrypto 
 ALLOW mds/pymds -> contrib/python/pycrypto
-ALLOW mds/s3/s3_mds_proxy -> contrib/python/pycrypto
-ALLOW metrika/core -> contrib/python/pycrypto
-ALLOW mlp/mail -> contrib/python/pycrypto
-ALLOW mssngr/router/tools/export_legacy_messages -> contrib/python/pycrypto
+ALLOW mds/s3/s3_mds_proxy -> contrib/python/pycrypto 
+ALLOW metrika/core -> contrib/python/pycrypto 
+ALLOW mlp/mail -> contrib/python/pycrypto 
+ALLOW mssngr/router/tools/export_legacy_messages -> contrib/python/pycrypto 
 ALLOW passport/infra/daemons/blackbox/ut/totp_manual/tests -> contrib/python/pycrypto
-ALLOW quality/functionality/turbo/merger/ut/medium -> contrib/python/pycrypto
-ALLOW samogon -> contrib/python/pycrypto
-ALLOW sandbox/common -> contrib/python/pycrypto
-ALLOW sandbox/virtualenv -> contrib/python/pycrypto
-ALLOW sandbox/yasandbox -> contrib/python/pycrypto
-ALLOW skynet/library -> contrib/python/pycrypto
-ALLOW travel/hotels/tools/searcher_client -> contrib/python/pycrypto
+ALLOW quality/functionality/turbo/merger/ut/medium -> contrib/python/pycrypto 
+ALLOW samogon -> contrib/python/pycrypto 
+ALLOW sandbox/common -> contrib/python/pycrypto 
+ALLOW sandbox/virtualenv -> contrib/python/pycrypto 
+ALLOW sandbox/yasandbox -> contrib/python/pycrypto 
+ALLOW skynet/library -> contrib/python/pycrypto 
+ALLOW travel/hotels/tools/searcher_client -> contrib/python/pycrypto 
 ALLOW travel/buses/connectors -> contrib/python/pycrypto
-ALLOW trust/emulator -> contrib/python/pycrypto
-ALLOW trust/processing_holder -> contrib/python/pycrypto
-ALLOW trust/tests/tests_trust_bindings -> contrib/python/pycrypto
-ALLOW yabs/server/tools/banner_user_choice -> contrib/python/pycrypto
+ALLOW trust/emulator -> contrib/python/pycrypto 
+ALLOW trust/processing_holder -> contrib/python/pycrypto 
+ALLOW trust/tests/tests_trust_bindings -> contrib/python/pycrypto 
+ALLOW yabs/server/tools/banner_user_choice -> contrib/python/pycrypto 
 ALLOW yabs/server/test -> contrib/python/pycrypto
 ALLOW ydo/database/active_record -> contrib/python/pycrypto
-ALLOW yweb/antispam/cid -> contrib/python/pycrypto
-ALLOW mail/payments/payments -> contrib/python/pycrypto
+ALLOW yweb/antispam/cid -> contrib/python/pycrypto 
+ALLOW mail/payments/payments -> contrib/python/pycrypto 
 DENY .* -> contrib/python/pycrypto
 
 ALLOW contrib/python/Geohash/tests -> contrib/python/Geohash
diff --git a/build/rules/contrib_restricted.policy b/build/rules/contrib_restricted.policy
index a83ead1904..23df94aaac 100644
--- a/build/rules/contrib_restricted.policy
+++ b/build/rules/contrib_restricted.policy
@@ -6,14 +6,14 @@
 # scale_ipp filter for ffmpeg use Intel IPP hence it is nonfree
 ALLOW strm/cv/ffmpeg_adcv/toshik_filters -> contrib/restricted/ffmpeg-3-scale-ipp
 
-# CityHash-1.0.2 is a specific version hardwired into ClickHouse public interface
-ALLOW clickhouse -> contrib/restricted/cityhash-1.0.2
+# CityHash-1.0.2 is a specific version hardwired into ClickHouse public interface 
+ALLOW clickhouse -> contrib/restricted/cityhash-1.0.2 
 ALLOW library/cpp/clickhouse -> contrib/restricted/cityhash-1.0.2
 ALLOW saas/library/hash_to_block_mode -> contrib/restricted/cityhash-1.0.2
-
+ 
 # dragonbox is a specific library for float formatting
 ALLOW clickhouse -> contrib/restricted/dragonbox
-
+ 
 # same rules for restricted set of sources in YQL
 ALLOW ydb/library/yql/udfs/common/clickhouse/client -> contrib/restricted/cityhash-1.0.2
 ALLOW ydb/library/yql/udfs/common/clickhouse/client -> contrib/restricted/boost
@@ -32,9 +32,9 @@ ALLOW clickhouse -> contrib/restricted/abseil-cpp
 # TurboBase64 is a fast vectorized library for encoding/decoding base64.
 ALLOW clickhouse -> contrib/restricted/turbo_base64
 
-# For HBase client: CONTRIB-1790
+# For HBase client: CONTRIB-1790 
 ALLOW passport/infra -> contrib/restricted/thrift
-
+ 
 # keyutils is LGPL: CONTRIB-2236
 ALLOW passport/infra -> contrib/restricted/keyutils
 
@@ -45,35 +45,35 @@ ALLOW mds -> contrib/restricted/uriparser
 ALLOW weather -> contrib/restricted/range-v3
 
 # ALSA library is LGPL
-ALLOW yandex_io -> contrib/restricted/alsa-lib
+ALLOW yandex_io -> contrib/restricted/alsa-lib 
 ALLOW smart_devices -> contrib/restricted/alsa-lib
 
-# Avahi is LGPL
-ALLOW yandex_io -> contrib/restricted/avahi
-
+# Avahi is LGPL 
+ALLOW yandex_io -> contrib/restricted/avahi 
+ 
 # GLib is LGPL
 ALLOW maps/libs/img -> contrib/restricted/glib
 ALLOW maps/renderer/libs/svgrenderer -> contrib/restricted/glib
-ALLOW market/cataloger -> contrib/restricted/glib
-ALLOW market/idx/feeds/feedparser -> contrib/restricted/glib
-ALLOW metrika/core/libs/statdaemons -> contrib/restricted/glib
-ALLOW metrika/core/libs/strconvert -> contrib/restricted/glib
-ALLOW yandex_io -> contrib/restricted/glib
-
-# GStreamer is LGPL
-ALLOW yandex_io -> contrib/restricted/gstreamer
-ALLOW yandex_io -> contrib/restricted/gst-plugins-base
-ALLOW yandex_io -> contrib/restricted/gst-plugins-good
-ALLOW yandex_io -> contrib/restricted/gst-plugins-bad
+ALLOW market/cataloger -> contrib/restricted/glib 
+ALLOW market/idx/feeds/feedparser -> contrib/restricted/glib 
+ALLOW metrika/core/libs/statdaemons -> contrib/restricted/glib 
+ALLOW metrika/core/libs/strconvert -> contrib/restricted/glib 
+ALLOW yandex_io -> contrib/restricted/glib 
+
+# GStreamer is LGPL 
+ALLOW yandex_io -> contrib/restricted/gstreamer 
+ALLOW yandex_io -> contrib/restricted/gst-plugins-base 
+ALLOW yandex_io -> contrib/restricted/gst-plugins-good 
+ALLOW yandex_io -> contrib/restricted/gst-plugins-bad 
 ALLOW yandex_io -> contrib/restricted/patched/gst-libav
-
-# mpg123 is LGPL
-ALLOW extsearch/audio/kernel/recoglib -> contrib/restricted/mpg123
-
-# OpenAL Soft is LGPL
-ALLOW yandex_io -> contrib/restricted/openal-soft
-ALLOW speechkit -> contrib/restricted/openal-soft
-
+ 
+# mpg123 is LGPL 
+ALLOW extsearch/audio/kernel/recoglib -> contrib/restricted/mpg123 
+ 
+# OpenAL Soft is LGPL 
+ALLOW yandex_io -> contrib/restricted/openal-soft 
+ALLOW speechkit -> contrib/restricted/openal-soft 
+ 
 # rubberband is a GPL audio stretching library
 ALLOW dict/mt/video -> contrib/restricted/rubberband
 
@@ -81,27 +81,27 @@ ALLOW dict/mt/video -> contrib/restricted/rubberband
 ALLOW library/cpp/containers/absl_flat_hash -> contrib/restricted/abseil-cpp/absl/container
 ALLOW library/cpp/containers/absl_tstring_flat_hash -> contrib/restricted/abseil-cpp-tstring/y_absl/container
 
-# spdlog is just yet another best logging engine
-# The best logging engine, however, is to be designed in CPPCOM-20
-ALLOW quasar/backend/src/base -> contrib/restricted/spdlog
-ALLOW crypta/lib/native/log -> contrib/restricted/spdlog
-ALLOW yandex_io -> contrib/restricted/spdlog
+# spdlog is just yet another best logging engine 
+# The best logging engine, however, is to be designed in CPPCOM-20 
+ALLOW quasar/backend/src/base -> contrib/restricted/spdlog 
+ALLOW crypta/lib/native/log -> contrib/restricted/spdlog 
+ALLOW yandex_io -> contrib/restricted/spdlog 
 ALLOW smart_devices/tools/launcher2 -> contrib/restricted/spdlog
 ALLOW smart_devices/tools/updater -> contrib/restricted/spdlog
-
+ 
 # cmph is a limited-use library
 ALLOW ads/yacontext -> contrib/restricted/cmph
 
 # http-parser is a low-level parser for http bytestream.
 # Consider using high-level alternatives.
-ALLOW mds -> contrib/restricted/http-parser
+ALLOW mds -> contrib/restricted/http-parser 
 ALLOW taxi/uservices -> contrib/restricted/http-parser
-ALLOW yt/yt/core/http -> contrib/restricted/http-parser
-ALLOW yweb/robot/fetcher/fetcher/user/http -> contrib/restricted/http-parser
+ALLOW yt/yt/core/http -> contrib/restricted/http-parser 
+ALLOW yweb/robot/fetcher/fetcher/user/http -> contrib/restricted/http-parser 
 
-# Prefer using skynet for data distribution
+# Prefer using skynet for data distribution 
 ALLOW maps/infra/ecstatic -> contrib/restricted/libtorrent
-
+ 
 # Consider using util / library/cpp/digest versions instead of a raw murmurhash functions.
 #
 # strm/common/go/pkg/murmur3 is a CGO binding to murmurhash, thus dependency is allowed
@@ -114,44 +114,44 @@ ALLOW maps/wikimap/mapspro/services/mrc/libs/common -> contrib/restricted/exiv2
 ALLOW yweb/disk/ocraas -> contrib/restricted/exiv2
 
 # Only allow boost in yandex projects listed below
-ALLOW adfox -> contrib/restricted/boost
-ALLOW ads -> contrib/restricted/boost
-ALLOW advq -> contrib/restricted/boost
-ALLOW alice/nlu -> contrib/restricted/boost
-ALLOW alice/vins_contrib/crfsuitex -> contrib/restricted/boost
-ALLOW clickhouse -> contrib/restricted/boost
-ALLOW devtools -> contrib/restricted/boost
-ALLOW extsearch/geo/poi_service/tools/storage_reader -> contrib/restricted/boost
-ALLOW infra/contrib/pdns -> contrib/restricted/boost
-ALLOW juggler/pongerd -> contrib/restricted/boost
-ALLOW lbs/locator -> contrib/restricted/boost
+ALLOW adfox -> contrib/restricted/boost 
+ALLOW ads -> contrib/restricted/boost 
+ALLOW advq -> contrib/restricted/boost 
+ALLOW alice/nlu -> contrib/restricted/boost 
+ALLOW alice/vins_contrib/crfsuitex -> contrib/restricted/boost 
+ALLOW clickhouse -> contrib/restricted/boost 
+ALLOW devtools -> contrib/restricted/boost 
+ALLOW extsearch/geo/poi_service/tools/storage_reader -> contrib/restricted/boost 
+ALLOW infra/contrib/pdns -> contrib/restricted/boost 
+ALLOW juggler/pongerd -> contrib/restricted/boost 
+ALLOW lbs/locator -> contrib/restricted/boost 
 ALLOW library/cpp/testing/boost_test$ -> contrib/restricted/boost/libs/test
 ALLOW library/cpp/testing/boost_test_main$ -> contrib/restricted/boost/libs/test
 ALLOW library/cpp/testing/gtest_boost_extensions -> contrib/restricted/boost
-ALLOW logbroker/pipe-parser -> contrib/restricted/boost
-ALLOW mail -> contrib/restricted/boost
-ALLOW maps -> contrib/restricted/boost
-ALLOW market/idx/feeds/feedparser -> contrib/restricted/boost
-ALLOW market/idx/stats/src -> contrib/restricted/boost
-ALLOW mds -> contrib/restricted/boost
-ALLOW metrika -> contrib/restricted/boost
-ALLOW netsys/tiles-vcdiff/gen-tiles -> contrib/restricted/boost
-ALLOW orgvisits/dwellplaces -> contrib/restricted/boost
-ALLOW orgvisits/heuristics -> contrib/restricted/boost
-ALLOW orgvisits/library/soc -> contrib/restricted/boost
-ALLOW quasar/backend -> contrib/restricted/boost
-ALLOW regulargeo/research -> contrib/restricted/boost
-ALLOW rem/python/geobase30 -> contrib/restricted/boost
+ALLOW logbroker/pipe-parser -> contrib/restricted/boost 
+ALLOW mail -> contrib/restricted/boost 
+ALLOW maps -> contrib/restricted/boost 
+ALLOW market/idx/feeds/feedparser -> contrib/restricted/boost 
+ALLOW market/idx/stats/src -> contrib/restricted/boost 
+ALLOW mds -> contrib/restricted/boost 
+ALLOW metrika -> contrib/restricted/boost 
+ALLOW netsys/tiles-vcdiff/gen-tiles -> contrib/restricted/boost 
+ALLOW orgvisits/dwellplaces -> contrib/restricted/boost 
+ALLOW orgvisits/heuristics -> contrib/restricted/boost 
+ALLOW orgvisits/library/soc -> contrib/restricted/boost 
+ALLOW quasar/backend -> contrib/restricted/boost 
+ALLOW regulargeo/research -> contrib/restricted/boost 
+ALLOW rem/python/geobase30 -> contrib/restricted/boost 
 ALLOW drive/contrib/cpp/telemetry -> contrib/restricted/boost
-ALLOW smart_devices -> contrib/restricted/boost
-ALLOW statbox/libstatbox -> contrib/restricted/boost
+ALLOW smart_devices -> contrib/restricted/boost 
+ALLOW statbox/libstatbox -> contrib/restricted/boost 
 ALLOW taxi/uservices -> contrib/restricted/boost
-ALLOW tools/idl -> contrib/restricted/boost
-ALLOW voicetech/tools -> contrib/restricted/boost
+ALLOW tools/idl -> contrib/restricted/boost 
+ALLOW voicetech/tools -> contrib/restricted/boost 
 ALLOW weather/archive/grid_api/lib -> contrib/restricted/boost
-ALLOW yabs/telephony -> contrib/restricted/boost
-ALLOW yandex_io -> contrib/restricted/boost
-ALLOW yweb/robot/js -> contrib/restricted/boost
+ALLOW yabs/telephony -> contrib/restricted/boost 
+ALLOW yandex_io -> contrib/restricted/boost 
+ALLOW yweb/robot/js -> contrib/restricted/boost 
 ALLOW market/access/server/env -> contrib/restricted/boost
 ALLOW sdg/library/cpp/ros_msg_parser -> contrib/restricted/boost
 ALLOW search/meta/scatter/ant -> contrib/restricted/boost
diff --git a/build/rules/go/contrib.policy b/build/rules/go/contrib.policy
index 1c7810e2bc..cac841b470 100644
--- a/build/rules/go/contrib.policy
+++ b/build/rules/go/contrib.policy
@@ -1,21 +1,21 @@
-# Permanent exceptions for heavily-patched Go contribs. Those responsible must support them
-# in any way required (update on demand, fix bugs, etc).
-
-# CSADMIN-26541. responsible: maxk@, g:marketsre
-ALLOW market/sre/tools/config-primer/src/internal/blogic -> contrib/go/patched/hugo
-
-# CONTRIB-1627. responsible: g:edadeal-go
-ALLOW edadeal -> contrib/go/patched/cony
-ALLOW contrib/go/patched/cony -> contrib/go/patched/cony
-
-# STRM-1124. responsible: grihabor@, g:strm-admin
-ALLOW strm/plgo -> contrib/go/patched/m3u8
-ALLOW contrib/go/patched/m3u8/example -> contrib/go/patched/m3u8
-
-# CONTRIB-1496 RTP/RTCP stack for Go. responsible: rmcf@
-# Moved to contrib/go, because library is not go-gettable.
-ALLOW yabs/telephony/platform/internal/rtp -> contrib/go/GoRTP
-
+# Permanent exceptions for heavily-patched Go contribs. Those responsible must support them 
+# in any way required (update on demand, fix bugs, etc). 
+ 
+# CSADMIN-26541. responsible: maxk@, g:marketsre 
+ALLOW market/sre/tools/config-primer/src/internal/blogic -> contrib/go/patched/hugo 
+ 
+# CONTRIB-1627. responsible: g:edadeal-go 
+ALLOW edadeal -> contrib/go/patched/cony 
+ALLOW contrib/go/patched/cony -> contrib/go/patched/cony 
+ 
+# STRM-1124. responsible: grihabor@, g:strm-admin 
+ALLOW strm/plgo -> contrib/go/patched/m3u8 
+ALLOW contrib/go/patched/m3u8/example -> contrib/go/patched/m3u8 
+ 
+# CONTRIB-1496 RTP/RTCP stack for Go. responsible: rmcf@ 
+# Moved to contrib/go, because library is not go-gettable. 
+ALLOW yabs/telephony/platform/internal/rtp -> contrib/go/GoRTP 
+ 
 # STRM-4414. responsible: nkhitrov@, g:strm-admin
 ALLOW strm/gorshok -> contrib/go/patched/gobgp
 ALLOW contrib/go/patched/gobgp -> contrib/go/patched/gobgp
@@ -30,4 +30,4 @@ ALLOW contrib/go/patched/gobgp -> vendor/github.com/jessevdk/go-flags
 ALLOW contrib/go/patched/gobgp -> vendor/github.com/kr/pretty
 ALLOW contrib/go/patched/gobgp -> vendor/github.com/go-test/deep
 
-DENY .* -> contrib/go/patched/
+DENY .* -> contrib/go/patched/ 
diff --git a/build/rules/go/vendor.policy b/build/rules/go/vendor.policy
index 3e9c0acada..fd6dc61106 100644
--- a/build/rules/go/vendor.policy
+++ b/build/rules/go/vendor.policy
@@ -718,7 +718,7 @@ ALLOW .* -> vendor/github.com/insomniacslk/dhcp
 # CONTRIB-2094
 ALLOW .* -> vendor/github.com/osrg/gobgp
 
-#
+# 
 # CONTRIB-2097 QUIC(HTTP/3) implementation library
 #
 ALLOW .* -> vendor/github.com/lucas-clemente/quic-go
@@ -875,103 +875,103 @@ ALLOW vendor -> vendor/github.com/fullstorydev/grpcurl/cmd/grpcurl
 
 
 #
-# Temporary exceptions.
-#
-
-
-# CONTRIB-1863. resposible: tserakhau@
-
-ALLOW transfer_manager/go/pkg/source/mysql/canal -> vendor/github.com/pingcap/errors
-ALLOW transfer_manager/go/pkg/source/mysql/canal -> vendor/github.com/pingcap/parser/ast
-ALLOW transfer_manager/go/pkg/source/mysql/canal -> vendor/github.com/pingcap/parser/format
-ALLOW transfer_manager/go/pkg/source/mysql/canal -> vendor/github.com/pingcap/parser
-ALLOW transfer_manager/go/pkg/source/mysql/canal -> vendor/github.com/satori/go.uuid
-ALLOW transfer_manager/go/pkg/source/mysql/canal -> vendor/github.com/siddontang/go-log/log
-ALLOW transfer_manager/go/pkg/source/mysql/canal -> vendor/github.com/siddontang/go-mysql/client
-ALLOW transfer_manager/go/pkg/source/mysql/canal -> vendor/github.com/siddontang/go-mysql/schema
-
+# Temporary exceptions. 
+# 
+ 
+
+# CONTRIB-1863. resposible: tserakhau@ 
+ 
+ALLOW transfer_manager/go/pkg/source/mysql/canal -> vendor/github.com/pingcap/errors 
+ALLOW transfer_manager/go/pkg/source/mysql/canal -> vendor/github.com/pingcap/parser/ast 
+ALLOW transfer_manager/go/pkg/source/mysql/canal -> vendor/github.com/pingcap/parser/format 
+ALLOW transfer_manager/go/pkg/source/mysql/canal -> vendor/github.com/pingcap/parser 
+ALLOW transfer_manager/go/pkg/source/mysql/canal -> vendor/github.com/satori/go.uuid 
+ALLOW transfer_manager/go/pkg/source/mysql/canal -> vendor/github.com/siddontang/go-log/log 
+ALLOW transfer_manager/go/pkg/source/mysql/canal -> vendor/github.com/siddontang/go-mysql/client 
+ALLOW transfer_manager/go/pkg/source/mysql/canal -> vendor/github.com/siddontang/go-mysql/schema 
+ 
 # CONTRIB-1244. resposible: frystile@
 ALLOW cloud/compute/gokikimr/client -> vendor/github.com/rcrowley/go-metrics
 ALLOW cloud/compute/snapshot/snapshot/lib/misc -> vendor/github.com/rcrowley/go-metrics
-
-# IGNIETFERRO-1287
-ALLOW cloud/compute/snapshot/snapshot/config -> vendor/github.com/pkg/errors
-ALLOW cloud/compute/snapshot/snapshot/lib/chunker -> vendor/github.com/pkg/errors
-ALLOW contrib/go/patched/hugo -> vendor/github.com/pkg/errors
-ALLOW edadeal/backend/go/charm/internal/pkg/store/pg -> vendor/github.com/pkg/errors
-ALLOW extsearch/video/station/starter/downloader -> vendor/github.com/pkg/errors
-ALLOW extsearch/video/station/starter/input -> vendor/github.com/pkg/errors
-ALLOW extsearch/video/station/starter/players -> vendor/github.com/pkg/errors
-ALLOW extsearch/video/station/starter/pusher -> vendor/github.com/pkg/errors
-ALLOW extsearch/video/station/starter/rules -> vendor/github.com/pkg/errors
-ALLOW library/go/yandex/solomon/reporters/pusher/httppusher -> vendor/github.com/pkg/errors
-ALLOW locdoc/doc/daas-farm/pkg/daasclient -> vendor/github.com/pkg/errors
-ALLOW locdoc/doc/daas-farm/pkg/menugen -> vendor/github.com/pkg/errors
-ALLOW locdoc/doc/daas-farm/pkg/wikiclient -> vendor/github.com/pkg/errors
-ALLOW locdoc/doc/daas-farm/pkg/wikigen -> vendor/github.com/pkg/errors
-ALLOW market/sre/services/rtcstats2graphite/src/internal/blogic -> vendor/github.com/pkg/errors
-ALLOW market/sre/services/rtcstats2graphite/src/internal/nanny -> vendor/github.com/pkg/errors
-ALLOW market/sre/services/rtcstats2graphite/src/internal/oops -> vendor/github.com/pkg/errors
-ALLOW market/sre/services/rtcstats2graphite/src/internal/walle -> vendor/github.com/pkg/errors
-ALLOW market/sre/services/rtcstats2graphite/src/internal/yasm -> vendor/github.com/pkg/errors
-ALLOW market/sre/tools/ya-gde/src/cmd/getthefacts -> vendor/github.com/pkg/errors
-ALLOW market/sre/tools/ya-gde/src/pkg/hostinfo -> vendor/github.com/pkg/errors
-ALLOW market/sre/tools/ya-gde/src/pkg/util -> vendor/github.com/pkg/errors
-ALLOW transfer_manager/go/pkg/abstract -> vendor/github.com/pkg/errors
-ALLOW yabs/telephony/platform/inventory/api/http -> vendor/github.com/pkg/errors
-
-# IGNIETFERRO-1396
-
-ALLOW district/feed_reader/app/lib -> vendor/github.com/jackc/pgx
-ALLOW edadeal/backend/go/charm/cmd/charm -> vendor/github.com/jackc/pgx
-ALLOW edadeal/backend/go/gluon/internal/app/bootstrap -> vendor/github.com/jackc/pgx
-ALLOW edadeal/backend/go/nachalnik/internal/app/bootstrap -> vendor/github.com/jackc/pgx
-ALLOW edadeal/backend/go/nachalnik/internal/pkg/store -> vendor/github.com/jackc/pgx
-ALLOW extsearch/video/robot/rt_transcoder/video-manager/db -> vendor/github.com/jackc/pgx
+ 
+# IGNIETFERRO-1287 
+ALLOW cloud/compute/snapshot/snapshot/config -> vendor/github.com/pkg/errors 
+ALLOW cloud/compute/snapshot/snapshot/lib/chunker -> vendor/github.com/pkg/errors 
+ALLOW contrib/go/patched/hugo -> vendor/github.com/pkg/errors 
+ALLOW edadeal/backend/go/charm/internal/pkg/store/pg -> vendor/github.com/pkg/errors 
+ALLOW extsearch/video/station/starter/downloader -> vendor/github.com/pkg/errors 
+ALLOW extsearch/video/station/starter/input -> vendor/github.com/pkg/errors 
+ALLOW extsearch/video/station/starter/players -> vendor/github.com/pkg/errors 
+ALLOW extsearch/video/station/starter/pusher -> vendor/github.com/pkg/errors 
+ALLOW extsearch/video/station/starter/rules -> vendor/github.com/pkg/errors 
+ALLOW library/go/yandex/solomon/reporters/pusher/httppusher -> vendor/github.com/pkg/errors 
+ALLOW locdoc/doc/daas-farm/pkg/daasclient -> vendor/github.com/pkg/errors 
+ALLOW locdoc/doc/daas-farm/pkg/menugen -> vendor/github.com/pkg/errors 
+ALLOW locdoc/doc/daas-farm/pkg/wikiclient -> vendor/github.com/pkg/errors 
+ALLOW locdoc/doc/daas-farm/pkg/wikigen -> vendor/github.com/pkg/errors 
+ALLOW market/sre/services/rtcstats2graphite/src/internal/blogic -> vendor/github.com/pkg/errors 
+ALLOW market/sre/services/rtcstats2graphite/src/internal/nanny -> vendor/github.com/pkg/errors 
+ALLOW market/sre/services/rtcstats2graphite/src/internal/oops -> vendor/github.com/pkg/errors 
+ALLOW market/sre/services/rtcstats2graphite/src/internal/walle -> vendor/github.com/pkg/errors 
+ALLOW market/sre/services/rtcstats2graphite/src/internal/yasm -> vendor/github.com/pkg/errors 
+ALLOW market/sre/tools/ya-gde/src/cmd/getthefacts -> vendor/github.com/pkg/errors 
+ALLOW market/sre/tools/ya-gde/src/pkg/hostinfo -> vendor/github.com/pkg/errors 
+ALLOW market/sre/tools/ya-gde/src/pkg/util -> vendor/github.com/pkg/errors 
+ALLOW transfer_manager/go/pkg/abstract -> vendor/github.com/pkg/errors 
+ALLOW yabs/telephony/platform/inventory/api/http -> vendor/github.com/pkg/errors 
+ 
+# IGNIETFERRO-1396 
+ 
+ALLOW district/feed_reader/app/lib -> vendor/github.com/jackc/pgx 
+ALLOW edadeal/backend/go/charm/cmd/charm -> vendor/github.com/jackc/pgx 
+ALLOW edadeal/backend/go/gluon/internal/app/bootstrap -> vendor/github.com/jackc/pgx 
+ALLOW edadeal/backend/go/nachalnik/internal/app/bootstrap -> vendor/github.com/jackc/pgx 
+ALLOW edadeal/backend/go/nachalnik/internal/pkg/store -> vendor/github.com/jackc/pgx 
+ALLOW extsearch/video/robot/rt_transcoder/video-manager/db -> vendor/github.com/jackc/pgx 
 ALLOW games/backend/internal/dbutils -> vendor/github.com/jackc/pgx
-ALLOW games/backend/pkg/database -> vendor/github.com/jackc/pgx
-ALLOW mail/calendar/load/bbmock -> vendor/github.com/jackc/pgx
-ALLOW mail/collectors/tests-load/pandora -> vendor/github.com/jackc/pgx
-ALLOW market/sre/services/dist_meta_store/app -> vendor/github.com/jackc/pgx
-ALLOW market/sre/services/dist_meta_store/database -> vendor/github.com/jackc/pgx
-ALLOW quasar/gackend/db -> vendor/github.com/jackc/pgx
-ALLOW transfer_manager/go/cmd/load_generator -> vendor/github.com/jackc/pgx
-ALLOW transfer_manager/go/pkg/mapreduce/pg_to_yt -> vendor/github.com/jackc/pgx
-ALLOW transfer_manager/go/pkg/sink/pg -> vendor/github.com/jackc/pgx
-ALLOW transfer_manager/go/pkg/source/pg -> vendor/github.com/jackc/pgx
-ALLOW transfer_manager/go/pkg/storage/pg -> vendor/github.com/jackc/pgx
-ALLOW transfer_manager/go/pkg/worker/tasks -> vendor/github.com/jackc/pgx
+ALLOW games/backend/pkg/database -> vendor/github.com/jackc/pgx 
+ALLOW mail/calendar/load/bbmock -> vendor/github.com/jackc/pgx 
+ALLOW mail/collectors/tests-load/pandora -> vendor/github.com/jackc/pgx 
+ALLOW market/sre/services/dist_meta_store/app -> vendor/github.com/jackc/pgx 
+ALLOW market/sre/services/dist_meta_store/database -> vendor/github.com/jackc/pgx 
+ALLOW quasar/gackend/db -> vendor/github.com/jackc/pgx 
+ALLOW transfer_manager/go/cmd/load_generator -> vendor/github.com/jackc/pgx 
+ALLOW transfer_manager/go/pkg/mapreduce/pg_to_yt -> vendor/github.com/jackc/pgx 
+ALLOW transfer_manager/go/pkg/sink/pg -> vendor/github.com/jackc/pgx 
+ALLOW transfer_manager/go/pkg/source/pg -> vendor/github.com/jackc/pgx 
+ALLOW transfer_manager/go/pkg/storage/pg -> vendor/github.com/jackc/pgx 
+ALLOW transfer_manager/go/pkg/worker/tasks -> vendor/github.com/jackc/pgx 
 ALLOW transfer_manager/go/pkg/dataagent/pg -> vendor/github.com/jackc/pgx
 ALLOW transfer_manager/go/tests/e2e/pg2pg/replication -> vendor/github.com/jackc/pgx
-ALLOW yabs/telephony/platform/common/db -> vendor/github.com/jackc/pgx
-ALLOW yabs/telephony/platform/common/lifecycle -> vendor/github.com/jackc/pgx
-ALLOW yabs/telephony/platform/registrar-agent -> vendor/github.com/jackc/pgx
-ALLOW yabs/vh/cms-pgaas/dhdd/db -> vendor/github.com/jackc/pgx
-ALLOW yabs/vh/cms-pgaas/transcoded -> vendor/github.com/jackc/pgx
-
-
-#
-# Permanent exceptions.
-#
-
+ALLOW yabs/telephony/platform/common/db -> vendor/github.com/jackc/pgx 
+ALLOW yabs/telephony/platform/common/lifecycle -> vendor/github.com/jackc/pgx 
+ALLOW yabs/telephony/platform/registrar-agent -> vendor/github.com/jackc/pgx 
+ALLOW yabs/vh/cms-pgaas/dhdd/db -> vendor/github.com/jackc/pgx 
+ALLOW yabs/vh/cms-pgaas/transcoded -> vendor/github.com/jackc/pgx 
+ 
+
+# 
+# Permanent exceptions. 
+# 
+ 
 # Docker is not vendored property. Docker dependency must be pulled-in explicitly.
 ALLOW vendor/ -> vendor/github.com/opencontainers/go-digest
 
-# CONTRIB-865. Jaeger YT plugin. responsible: prime@
+# CONTRIB-865. Jaeger YT plugin. responsible: prime@ 
 ALLOW yt/jaeger/plugin -> vendor/github.com/jaegertracing/jaeger/plugin/storage/grpc
 ALLOW yt/jaeger/plugin -> vendor/github.com/jaegertracing/jaeger/storage/spanstore
 ALLOW yt/jaeger/plugin -> vendor/github.com/jaegertracing/jaeger/storage/dependencystore
 ALLOW yt/jaeger/plugin -> vendor/github.com/jaegertracing/jaeger/model
 ALLOW yt/jaeger/plugin -> vendor/github.com/gogo/protobuf
 ALLOW yt/jaeger/plugin -> vendor/github.com/hashicorp/go-plugin
-
-# CONTRIB-1518 client for monkey-patched Apache Pulsar by TuyaInc. responsible: jock@
-ALLOW alice/iot/adapters/tuya_adapter -> vendor/github.com/TuyaInc/tuya_pulsar_sdk_go
-ALLOW alice/iot/adapters/tuya_adapter/server -> vendor/github.com/sirupsen/logrus
-
-# SUBBOTNIK-90
-ALLOW infra/rtc/instance_resolver/pkg/clients/iss3 -> vendor/git.apache.org/thrift.git/lib/go
-
+ 
+# CONTRIB-1518 client for monkey-patched Apache Pulsar by TuyaInc. responsible: jock@ 
+ALLOW alice/iot/adapters/tuya_adapter -> vendor/github.com/TuyaInc/tuya_pulsar_sdk_go 
+ALLOW alice/iot/adapters/tuya_adapter/server -> vendor/github.com/sirupsen/logrus 
+ 
+# SUBBOTNIK-90 
+ALLOW infra/rtc/instance_resolver/pkg/clients/iss3 -> vendor/git.apache.org/thrift.git/lib/go 
+ 
 # Benchmarks using github.com/pkg/errors
 ALLOW library/go/core/xerrors -> vendor/github.com/pkg/errors
 
diff --git a/build/rules/junk.policy b/build/rules/junk.policy
index 20b9820fbd..ae74b50bc3 100644
--- a/build/rules/junk.policy
+++ b/build/rules/junk.policy
@@ -1,10 +1,10 @@
-# DISCLAIMER: Everything in junk is junk. You are allowed to peerdir anything
-# you want, be it a banned library or some project gory guts, whatever, but
-# such junk code cannot be considered as a reason to add any new contribs,
-# no matter how big the junk code is and how much does it cost (always zero).
-#
-# See contrib/README.md for more details about contribs.
-# See https://wiki.yandex-team.ru/arcadia/junk/ for junk restrictions.
-
-ALLOW junk -> .*
-DENY .* -> junk
+# DISCLAIMER: Everything in junk is junk. You are allowed to peerdir anything 
+# you want, be it a banned library or some project gory guts, whatever, but 
+# such junk code cannot be considered as a reason to add any new contribs, 
+# no matter how big the junk code is and how much does it cost (always zero). 
+# 
+# See contrib/README.md for more details about contribs. 
+# See https://wiki.yandex-team.ru/arcadia/junk/ for junk restrictions. 
+ 
+ALLOW junk -> .* 
+DENY .* -> junk 
diff --git a/build/rules/library_deps.policy b/build/rules/library_deps.policy
index 954d0198c6..9c23af1d4f 100644
--- a/build/rules/library_deps.policy
+++ b/build/rules/library_deps.policy
@@ -1,44 +1,44 @@
-ALLOW library -> build
-ALLOW library -> contrib
-ALLOW library -> util
-ALLOW library -> library
-ALLOW library -> certs
-ALLOW library/.*/(n)?yt -> mapreduce/yt
+ALLOW library -> build 
+ALLOW library -> contrib 
+ALLOW library -> util 
+ALLOW library -> library 
+ALLOW library -> certs 
+ALLOW library/.*/(n)?yt -> mapreduce/yt 
 ALLOW library/java -> devtools/junit5-runner
-ALLOW library/java/.*/ut -> devtools/(jtest)|(junit-runner)
-ALLOW library/java/.*/src/test -> devtools/(jtest)|(junit-runner)
-ALLOW library/java/.*/tests -> devtools/(jtest)|(junit-runner)
-ALLOW library/java/hnsw/ut -> devtools/(jtest)|(junit-runner)
-ALLOW library/python/.*/test -> devtools/ya/(test)|(exts)
-ALLOW library/(python/)?testing -> devtools/ya/
-ALLOW library/recipes -> devtools/ya/
-ALLOW library/.*/ipreg -> ipreg
-ALLOW library/cpp/deprecated/ipreg1 -> ipreg
-ALLOW library/cpp/geobase -> geobase
-ALLOW library/python/zipatch -> vcs/svn/wc/client
+ALLOW library/java/.*/ut -> devtools/(jtest)|(junit-runner) 
+ALLOW library/java/.*/src/test -> devtools/(jtest)|(junit-runner) 
+ALLOW library/java/.*/tests -> devtools/(jtest)|(junit-runner) 
+ALLOW library/java/hnsw/ut -> devtools/(jtest)|(junit-runner) 
+ALLOW library/python/.*/test -> devtools/ya/(test)|(exts) 
+ALLOW library/(python/)?testing -> devtools/ya/ 
+ALLOW library/recipes -> devtools/ya/ 
+ALLOW library/.*/ipreg -> ipreg 
+ALLOW library/cpp/deprecated/ipreg1 -> ipreg 
+ALLOW library/cpp/geobase -> geobase 
+ALLOW library/python/zipatch -> vcs/svn/wc/client 
 ALLOW library/(java/ticket_parser2)|(hnsw) -> iceberg
-ALLOW library/python/bstr -> yt/python/client
-ALLOW library/python/django -> devtools/ya/yalibrary/makelists
-ALLOW library/python/django_abc_data -> intranet/sync_tools
+ALLOW library/python/bstr -> yt/python/client 
+ALLOW library/python/django -> devtools/ya/yalibrary/makelists 
+ALLOW library/python/django_abc_data -> intranet/sync_tools 
 ALLOW library/python/coredump_filter -> sandbox/sdk2/helpers/coredump_filter
-ALLOW library/python/cqueue -> skynet/api/copier
+ALLOW library/python/cqueue -> skynet/api/copier 
 ALLOW library/python/monitoring/solo/handlers/solomon/v3/base -> solomon/protos/api/v3
 ALLOW library/python/monitoring/solo/objects/solomon/v3 -> solomon/protos/api/v3
-ALLOW library/python/nirvana -> yt/python/client
-ALLOW library/python/type_info -> yt/python/client
-ALLOW library/python/ylock -> yt/python/yt/wrapper
-ALLOW library/python/yt -> yt/python/client_lite
-ALLOW library/python/yt/example -> yt/python/client
-ALLOW library/python/statface_client -> statbox/libstatbox/python
+ALLOW library/python/nirvana -> yt/python/client 
+ALLOW library/python/type_info -> yt/python/client 
+ALLOW library/python/ylock -> yt/python/yt/wrapper 
+ALLOW library/python/yt -> yt/python/client_lite 
+ALLOW library/python/yt/example -> yt/python/client 
+ALLOW library/python/statface_client -> statbox/libstatbox/python 
 ALLOW library/python/pytest-mongodb -> devtools/swag/lib
-ALLOW library/cpp/minhash/tools/mr_hash -> mapreduce
-ALLOW library/cpp/token/ut -> kernel
-ALLOW library/cpp/infected_masks -> kernel
-ALLOW library/cpp/deprecated/dater_old/scanner -> kernel
-ALLOW library/cpp/http/client/fetch -> kernel
-ALLOW library/cpp/text_processing/yandex_specific_lemmer -> kernel/lemmer
-ALLOW library/cpp/digest/benchmark -> yabs/server/util
-ALLOW library/cpp/eventlog/rt/tool -> search/idl
-ALLOW library/cpp/dolbilo/planner -> search/idl
-ALLOW library/cpp/vowpalwabbit/tools/vw_ops -> ml/differential_evolution
-DENY library -> .*
+ALLOW library/cpp/minhash/tools/mr_hash -> mapreduce 
+ALLOW library/cpp/token/ut -> kernel 
+ALLOW library/cpp/infected_masks -> kernel 
+ALLOW library/cpp/deprecated/dater_old/scanner -> kernel 
+ALLOW library/cpp/http/client/fetch -> kernel 
+ALLOW library/cpp/text_processing/yandex_specific_lemmer -> kernel/lemmer 
+ALLOW library/cpp/digest/benchmark -> yabs/server/util 
+ALLOW library/cpp/eventlog/rt/tool -> search/idl 
+ALLOW library/cpp/dolbilo/planner -> search/idl 
+ALLOW library/cpp/vowpalwabbit/tools/vw_ops -> ml/differential_evolution 
+DENY library -> .* 
diff --git a/build/rules/maps/maps.policy b/build/rules/maps/maps.policy
index 8abf3fbbd7..7967135e0a 100644
--- a/build/rules/maps/maps.policy
+++ b/build/rules/maps/maps.policy
@@ -1,10 +1,10 @@
-ALLOW maps/infra/ratelimiter2/server -> maps/libs/deprecated/bson
-ALLOW maps/tools/grinder -> maps/libs/deprecated/bson
-ALLOW taxi/tools/dorblu -> maps/libs/deprecated/bson
-
-ALLOW maps/masstransit/info -> maps/libs/deprecated/mongo
-ALLOW taxi/tools/dorblu -> maps/libs/deprecated/mongo
-
+ALLOW maps/infra/ratelimiter2/server -> maps/libs/deprecated/bson 
+ALLOW maps/tools/grinder -> maps/libs/deprecated/bson 
+ALLOW taxi/tools/dorblu -> maps/libs/deprecated/bson 
+ 
+ALLOW maps/masstransit/info -> maps/libs/deprecated/mongo 
+ALLOW taxi/tools/dorblu -> maps/libs/deprecated/mongo 
+ 
 # Use maps/libs/locale instead
 ALLOW maps/automotive/remote_access/libs/i18n -> maps/libs/deprecated/localeutils
 ALLOW maps/carparks/renderer/datasource -> maps/libs/deprecated/localeutils
@@ -25,7 +25,7 @@ ALLOW maps/snippets/tools/masstransit -> maps/libs/deprecated/localeutils
 ALLOW maps/tools/indoor -> maps/libs/deprecated/localeutils
 ALLOW maps/wikimap/mapspro/services/mrc -> maps/libs/deprecated/localeutils
 ALLOW netsys/tiles-vcdiff/gen-tiles -> maps/libs/deprecated/localeutils
-
+ 
 # Use maps/libs/geolib instead
 ALLOW maps/streetview/backoffice/lib -> maps/libs/deprecated/coordtrans_pymod
 
@@ -34,128 +34,128 @@ ALLOW maps/analyzer -> maps/libs/deprecated/boost_time
 ALLOW maps/routing -> maps/libs/deprecated/boost_time
 ALLOW maps/tools/naviguide/lib -> maps/libs/deprecated/boost_time
 
-# Stop spreading deprecated stuff
+# Stop spreading deprecated stuff 
 ALLOW maps/libs/deprecated -> maps/libs/deprecated
-DENY .* -> maps/libs/deprecated
-
-# maps/doc/proto holds proto interface for maps backends. Anyone can use them.
-ALLOW .* -> maps/doc/proto
-
-# These libraries are allowed for general use
-ALLOW .* -> maps/libs/common
-ALLOW .* -> maps/libs/csv
+DENY .* -> maps/libs/deprecated 
+ 
+# maps/doc/proto holds proto interface for maps backends. Anyone can use them. 
+ALLOW .* -> maps/doc/proto 
+ 
+# These libraries are allowed for general use 
+ALLOW .* -> maps/libs/common 
+ALLOW .* -> maps/libs/csv 
 ALLOW .* -> maps/libs/enum_io
-ALLOW .* -> maps/libs/geolib
-ALLOW .* -> maps/libs/http
-ALLOW .* -> maps/libs/json
-ALLOW .* -> maps/libs/nirvana
-ALLOW .* -> maps/libs/local_postgres
+ALLOW .* -> maps/libs/geolib 
+ALLOW .* -> maps/libs/http 
+ALLOW .* -> maps/libs/json 
+ALLOW .* -> maps/libs/nirvana 
+ALLOW .* -> maps/libs/local_postgres 
 ALLOW .* -> maps/libs/locale
-ALLOW .* -> maps/libs/pgpool
-ALLOW .* -> maps/libs/s3mds
-ALLOW .* -> maps/libs/sql_chemistry
+ALLOW .* -> maps/libs/pgpool 
+ALLOW .* -> maps/libs/s3mds 
+ALLOW .* -> maps/libs/sql_chemistry 
 ALLOW .* -> maps/libs/st
-ALLOW .* -> maps/libs/tile
+ALLOW .* -> maps/libs/tile 
 ALLOW .* -> maps/libs/ttl_cache
 ALLOW .* -> maps/pylibs/local_postgres
-
-# Fix current PEERDIRs and prevent any further growth
-ALLOW media/road-graph-tool -> maps/libs/road_graph
-ALLOW media/road-graph-tool -> maps/libs/snap
-ALLOW media/road-graph-tool -> maps/libs/succinct_rtree
-ALLOW netsys/tiles-vcdiff/gen-tiles -> maps/renderer
-ALLOW quality/ab_testing/cofe/projects/maps -> maps/analytics
-ALLOW taxi/antifraud/mult_id -> maps/libs/geolib
-ALLOW taxi/graph/external/graph2/tests/mapmatcher -> maps/libs/mms
-ALLOW taxi/graph/external/graph2/tests/mapmatcher -> maps/libs/mms
-ALLOW taxi/graph/libs/easyview_helpers -> maps/analyzer/libs/common
+ 
+# Fix current PEERDIRs and prevent any further growth 
+ALLOW media/road-graph-tool -> maps/libs/road_graph 
+ALLOW media/road-graph-tool -> maps/libs/snap 
+ALLOW media/road-graph-tool -> maps/libs/succinct_rtree 
+ALLOW netsys/tiles-vcdiff/gen-tiles -> maps/renderer 
+ALLOW quality/ab_testing/cofe/projects/maps -> maps/analytics 
+ALLOW taxi/antifraud/mult_id -> maps/libs/geolib 
+ALLOW taxi/graph/external/graph2/tests/mapmatcher -> maps/libs/mms 
+ALLOW taxi/graph/external/graph2/tests/mapmatcher -> maps/libs/mms 
+ALLOW taxi/graph/libs/easyview_helpers -> maps/analyzer/libs/common 
 ALLOW taxi/graph/libs/easyview_helpers -> maps/tools/easyview/lib/io
-ALLOW taxi/graph/libs/graph -> maps/analyzer/libs/data
-ALLOW taxi/graph/libs/graph -> maps/analyzer/libs/graphmatching
-ALLOW taxi/graph/libs/graph -> maps/libs/common
-ALLOW taxi/graph/libs/graph -> maps/libs/edge_persistent_index
-ALLOW taxi/graph/libs/graph -> maps/libs/edge_persistent_index/packer/lib
-ALLOW taxi/graph/libs/graph -> maps/libs/jams/graph-spatial
-ALLOW taxi/graph/libs/graph -> maps/libs/jams/router
-ALLOW taxi/graph/libs/graph -> maps/libs/jams/static-graph
-ALLOW taxi/graph/libs/graph -> maps/libs/mms
-ALLOW taxi/graph/libs/graph -> maps/libs/road_graph
-ALLOW taxi/graph/libs/graph -> maps/libs/road_graph/serialization
-ALLOW taxi/graph/libs/graph -> maps/libs/snap
-ALLOW taxi/graph/libs/graph -> maps/libs/succinct_rtree/serialization
-ALLOW taxi/graph/libs/graph -> maps/routing/common
-ALLOW taxi/graph/libs/graph -> maps/routing/turn_penalties
+ALLOW taxi/graph/libs/graph -> maps/analyzer/libs/data 
+ALLOW taxi/graph/libs/graph -> maps/analyzer/libs/graphmatching 
+ALLOW taxi/graph/libs/graph -> maps/libs/common 
+ALLOW taxi/graph/libs/graph -> maps/libs/edge_persistent_index 
+ALLOW taxi/graph/libs/graph -> maps/libs/edge_persistent_index/packer/lib 
+ALLOW taxi/graph/libs/graph -> maps/libs/jams/graph-spatial 
+ALLOW taxi/graph/libs/graph -> maps/libs/jams/router 
+ALLOW taxi/graph/libs/graph -> maps/libs/jams/static-graph 
+ALLOW taxi/graph/libs/graph -> maps/libs/mms 
+ALLOW taxi/graph/libs/graph -> maps/libs/road_graph 
+ALLOW taxi/graph/libs/graph -> maps/libs/road_graph/serialization 
+ALLOW taxi/graph/libs/graph -> maps/libs/snap 
+ALLOW taxi/graph/libs/graph -> maps/libs/succinct_rtree/serialization 
+ALLOW taxi/graph/libs/graph -> maps/routing/common 
+ALLOW taxi/graph/libs/graph -> maps/routing/turn_penalties 
 ALLOW taxi/graph/libs/graph -> maps/tools/easyview/lib/io
-ALLOW taxi/graph/libs/graph-test -> maps/libs/geolib
-ALLOW taxi/graph/libs/mapmatcher -> maps/analyzer/libs/common
-ALLOW taxi/graph/libs/mapmatcher -> maps/analyzer/libs/data
-ALLOW taxi/graph/libs/mapmatcher -> maps/analyzer/libs/graphmatching
-ALLOW taxi/graph/libs/mapmatcher -> maps/libs/common
-ALLOW taxi/graph/libs/mapmatcher -> maps/libs/edge_persistent_index
-ALLOW taxi/graph/libs/mapmatcher -> maps/libs/jams/graph-spatial
-ALLOW taxi/graph/libs/mapmatcher -> maps/libs/jams/router
-ALLOW taxi/graph/libs/mapmatcher -> maps/libs/jams/static-graph
-ALLOW taxi/graph/libs/mapmatcher -> maps/libs/mms
-ALLOW taxi/graph/libs/mapmatcher -> maps/libs/road_graph
-ALLOW taxi/graph/libs/mapmatcher -> maps/libs/road_graph/serialization
-ALLOW taxi/graph/libs/mapmatcher -> maps/libs/snap
-ALLOW taxi/graph/libs/mapmatcher -> maps/libs/succinct_rtree/serialization
-ALLOW taxi/graph/libs/mapmatcher -> maps/routing/common
-ALLOW taxi/graph/libs/mapmatcher -> maps/routing/turn_penalties
+ALLOW taxi/graph/libs/graph-test -> maps/libs/geolib 
+ALLOW taxi/graph/libs/mapmatcher -> maps/analyzer/libs/common 
+ALLOW taxi/graph/libs/mapmatcher -> maps/analyzer/libs/data 
+ALLOW taxi/graph/libs/mapmatcher -> maps/analyzer/libs/graphmatching 
+ALLOW taxi/graph/libs/mapmatcher -> maps/libs/common 
+ALLOW taxi/graph/libs/mapmatcher -> maps/libs/edge_persistent_index 
+ALLOW taxi/graph/libs/mapmatcher -> maps/libs/jams/graph-spatial 
+ALLOW taxi/graph/libs/mapmatcher -> maps/libs/jams/router 
+ALLOW taxi/graph/libs/mapmatcher -> maps/libs/jams/static-graph 
+ALLOW taxi/graph/libs/mapmatcher -> maps/libs/mms 
+ALLOW taxi/graph/libs/mapmatcher -> maps/libs/road_graph 
+ALLOW taxi/graph/libs/mapmatcher -> maps/libs/road_graph/serialization 
+ALLOW taxi/graph/libs/mapmatcher -> maps/libs/snap 
+ALLOW taxi/graph/libs/mapmatcher -> maps/libs/succinct_rtree/serialization 
+ALLOW taxi/graph/libs/mapmatcher -> maps/routing/common 
+ALLOW taxi/graph/libs/mapmatcher -> maps/routing/turn_penalties 
 ALLOW taxi/graph/libs/mapmatcher -> maps/tools/easyview/lib/io
 ALLOW taxi/graph/libs/mapmatcher -> maps/analyzer/libs/guidance
-ALLOW taxi/graph/libs/nearest_edges -> maps/libs/common
-ALLOW taxi/graph/libs/nearest_edges -> maps/libs/jams/graph-spatial
-ALLOW taxi/graph/libs/nearest_edges -> maps/libs/jams/router
-ALLOW taxi/graph/libs/nearest_edges -> maps/libs/jams/static-graph
-ALLOW taxi/graph/libs/nearest_edges -> maps/libs/mms
-ALLOW taxi/graph/libs/nearest_edges -> maps/libs/road_graph
-ALLOW taxi/graph/libs/nearest_edges -> maps/libs/road_graph/serialization
-ALLOW taxi/graph/libs/nearest_edges -> maps/libs/snap
-ALLOW taxi/graph/libs/nearest_edges -> maps/libs/succinct_rtree/serialization
+ALLOW taxi/graph/libs/nearest_edges -> maps/libs/common 
+ALLOW taxi/graph/libs/nearest_edges -> maps/libs/jams/graph-spatial 
+ALLOW taxi/graph/libs/nearest_edges -> maps/libs/jams/router 
+ALLOW taxi/graph/libs/nearest_edges -> maps/libs/jams/static-graph 
+ALLOW taxi/graph/libs/nearest_edges -> maps/libs/mms 
+ALLOW taxi/graph/libs/nearest_edges -> maps/libs/road_graph 
+ALLOW taxi/graph/libs/nearest_edges -> maps/libs/road_graph/serialization 
+ALLOW taxi/graph/libs/nearest_edges -> maps/libs/snap 
+ALLOW taxi/graph/libs/nearest_edges -> maps/libs/succinct_rtree/serialization 
 ALLOW taxi/graph/libs/nearest_edges -> maps/tools/easyview/lib/io
-ALLOW taxi/graph/libs/predict -> maps/analyzer/libs/common
-ALLOW taxi/graph/libs/probmatching -> maps/analyzer/libs/mapmatching
-ALLOW taxi/graph/libs/routing -> maps/libs/common
-ALLOW taxi/graph/libs/routing -> maps/libs/leptidea
-ALLOW taxi/graph/libs/routing -> maps/libs/road_graph
-ALLOW taxi/graph/libs/routing -> maps/routing/common
-ALLOW taxi/graph/libs/search -> maps/analyzer/libs/common
-ALLOW taxi/graph/libs/shortest_path -> maps/analyzer/libs/data
-ALLOW taxi/graph/libs/shortest_path -> maps/analyzer/libs/shortest_path
-ALLOW taxi/graph/libs/shortest_path -> maps/libs/common
-ALLOW taxi/graph/libs/shortest_path -> maps/libs/mms
-ALLOW taxi/graph/libs/shortest_path -> maps/routing/common
-ALLOW taxi/graph/libs/shortest_path -> maps/routing/turn_penalties
-ALLOW taxi/graph/libs/tests/graph -> maps/libs/jams/static-graph
+ALLOW taxi/graph/libs/predict -> maps/analyzer/libs/common 
+ALLOW taxi/graph/libs/probmatching -> maps/analyzer/libs/mapmatching 
+ALLOW taxi/graph/libs/routing -> maps/libs/common 
+ALLOW taxi/graph/libs/routing -> maps/libs/leptidea 
+ALLOW taxi/graph/libs/routing -> maps/libs/road_graph 
+ALLOW taxi/graph/libs/routing -> maps/routing/common 
+ALLOW taxi/graph/libs/search -> maps/analyzer/libs/common 
+ALLOW taxi/graph/libs/shortest_path -> maps/analyzer/libs/data 
+ALLOW taxi/graph/libs/shortest_path -> maps/analyzer/libs/shortest_path 
+ALLOW taxi/graph/libs/shortest_path -> maps/libs/common 
+ALLOW taxi/graph/libs/shortest_path -> maps/libs/mms 
+ALLOW taxi/graph/libs/shortest_path -> maps/routing/common 
+ALLOW taxi/graph/libs/shortest_path -> maps/routing/turn_penalties 
+ALLOW taxi/graph/libs/tests/graph -> maps/libs/jams/static-graph 
 ALLOW taxi/graph/libs/tests/mapmatcher -> maps/analyzer/libs/track_generator
-ALLOW taxi/graph/libs/tests/mapmatcher -> maps/libs/mms
-ALLOW taxi/graph/libs/tests/nearest_edges -> maps/libs/jams/static-graph
-ALLOW taxi/graph/libs/tests/routing -> maps/libs/road_graph
-ALLOW taxi/graph/tools/bench-nearest-edges -> maps/libs/jams/static-graph
-ALLOW taxi/graph/tools/bench-nearest-edges -> maps/libs/road_graph
+ALLOW taxi/graph/libs/tests/mapmatcher -> maps/libs/mms 
+ALLOW taxi/graph/libs/tests/nearest_edges -> maps/libs/jams/static-graph 
+ALLOW taxi/graph/libs/tests/routing -> maps/libs/road_graph 
+ALLOW taxi/graph/tools/bench-nearest-edges -> maps/libs/jams/static-graph 
+ALLOW taxi/graph/tools/bench-nearest-edges -> maps/libs/road_graph 
 ALLOW taxi/graph/tools/find-one-way-gates -> maps/tools/easyview/lib/io
 ALLOW taxi/graph/tools/generate-graph-tracks -> maps/analyzer/libs/track_generator
-ALLOW taxi/graph/tools/generate-graph-tracks -> maps/libs/mms
-ALLOW taxi/graph/tools/lib -> maps/libs/road_graph
+ALLOW taxi/graph/tools/generate-graph-tracks -> maps/libs/mms 
+ALLOW taxi/graph/tools/lib -> maps/libs/road_graph 
 ALLOW taxi/graph/tools/ -> maps/tools/easyview/pylib
-ALLOW taxi/tools/dorblu/lib -> maps/libs/common
-ALLOW taxi/tools/dorblu/lib -> maps/libs/deprecated/bson
-ALLOW taxi/tools/dorblu/lib -> maps/libs/deprecated/mongo
-ALLOW taxi/tools/dorblu/lib -> maps/libs/json
-ALLOW taxi/tools/dorblu/lib -> maps/libs/log8
-ALLOW taxi/tools/dorblu/agent -> maps/libs/log8
-ALLOW taxi/tools/dorblu/aggregator -> maps/libs/log8
-ALLOW taxi/tools/dorblu/lib -> maps/libs/http
-ALLOW yql/udfs/taxi/graph -> maps/libs/leptidea
-
+ALLOW taxi/tools/dorblu/lib -> maps/libs/common 
+ALLOW taxi/tools/dorblu/lib -> maps/libs/deprecated/bson 
+ALLOW taxi/tools/dorblu/lib -> maps/libs/deprecated/mongo 
+ALLOW taxi/tools/dorblu/lib -> maps/libs/json 
+ALLOW taxi/tools/dorblu/lib -> maps/libs/log8 
+ALLOW taxi/tools/dorblu/agent -> maps/libs/log8 
+ALLOW taxi/tools/dorblu/aggregator -> maps/libs/log8 
+ALLOW taxi/tools/dorblu/lib -> maps/libs/http 
+ALLOW yql/udfs/taxi/graph -> maps/libs/leptidea 
+ 
 ALLOW maps/ -> maps/
 ALLOW sandbox/projects/maps -> maps/
 ALLOW sandbox/projects/mapsearch -> maps/
 ALLOW sandbox/projects/masstransit -> maps/
 ALLOW sprav/altay/panorama -> maps/streetview/libs
 ALLOW yql/udfs/maps -> maps/
-
+ 
 # maps_adv will be split into maps and smb
 ALLOW maps_adv/ -> maps/
 ALLOW maps_adv/ -> maps_adv/
@@ -175,5 +175,5 @@ ALLOW toloka -> maps/wikimap/mapspro/services/mrc/libs/
 # allow using yacare to implement piglet sync service
 ALLOW devtools/contrib -> maps/infra/yacare
 
-# Do not allow PEERDIRs into maps unless such PEERDIRs have be explicitly allowed above
+# Do not allow PEERDIRs into maps unless such PEERDIRs have be explicitly allowed above 
 DENY .* -> maps/
diff --git a/build/rules/passport.policy b/build/rules/passport.policy
index f4358c718b..dd0e9da02c 100644
--- a/build/rules/passport.policy
+++ b/build/rules/passport.policy
@@ -1,14 +1,14 @@
-# PERSISTENT EXCEPTION: 'ya yav' handler
+# PERSISTENT EXCEPTION: 'ya yav' handler 
 ALLOW devtools/ya/handlers/yav -> passport/backend/vault/cli/yav/vault_client_cli
-
+ 
 # PERSISTENT EXCEPTION: PASSP-31449
 ALLOW mail/so/daemons/antifraud -> passport/infra/daemons/ysa/fingerprint
 
-# PERSISTENT EXCEPTION: useful for debug purposes
-ALLOW junk -> passport/
-
-# COMMON RULE: Self using
-ALLOW passport -> passport/
-
-# COMMON RULE: we need freedom for refactorings
-DENY .* -> passport/
+# PERSISTENT EXCEPTION: useful for debug purposes 
+ALLOW junk -> passport/ 
+ 
+# COMMON RULE: Self using 
+ALLOW passport -> passport/ 
+ 
+# COMMON RULE: we need freedom for refactorings 
+DENY .* -> passport/ 
diff --git a/build/rules/yp.policy b/build/rules/yp.policy
index b4c88a9f7c..11ddadc7f3 100644
--- a/build/rules/yp.policy
+++ b/build/rules/yp.policy
@@ -1,3 +1,3 @@
-ALLOW yp -> yp/server
-
-DENY .* -> yp/server
+ALLOW yp -> yp/server 
+ 
+DENY .* -> yp/server 
diff --git a/build/rules/yt.policy b/build/rules/yt.policy
index 2924025dd5..abc3d9baa2 100644
--- a/build/rules/yt.policy
+++ b/build/rules/yt.policy
@@ -1,6 +1,6 @@
-ALLOW yt -> yt/yt/server
-
-DENY .* -> yt/yt/server
+ALLOW yt -> yt/yt/server 
+ 
+DENY .* -> yt/yt/server 
 
 ALLOW mapreduce/yt/experiments -> mapreduce/yt/experiments
 DENY .* -> mapreduce/yt/experiments
diff --git a/build/scripts/autotar_gendirs.py b/build/scripts/autotar_gendirs.py
index a1228108aa..c9a25b363e 100644
--- a/build/scripts/autotar_gendirs.py
+++ b/build/scripts/autotar_gendirs.py
@@ -1,70 +1,70 @@
-from __future__ import print_function
-
-import os
-import sys
-import argparse
-import tarfile
-import subprocess
-
-
-def is_exe(fpath):
-    return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
-
-
-def pack_dir(dir_path, dest_path):
-    dir_path = os.path.abspath(dir_path)
-    for tar_exe in ('/usr/bin/tar', '/bin/tar'):
-        if is_exe(tar_exe):
-            subprocess.check_call([tar_exe, '-cf', dest_path, '-C', os.path.dirname(dir_path), os.path.basename(dir_path)])
-            break
-    else:
-        with tarfile.open(dest_path, 'w') as out:
-            out.add(dir_path, arcname=os.path.basename(dir_path))
-
-
-def unpack_dir(tared_dir, dest_path):
-    tared_dir = os.path.abspath(tared_dir)
-    if not os.path.exists(dest_path):
-        os.makedirs(dest_path)
-    for tar_exe in ('/usr/bin/tar', '/bin/tar'):
-        if is_exe(tar_exe):
-            subprocess.check_call([tar_exe, '-xf', tared_dir, '-C', dest_path])
-            break
-    else:
-        with tarfile.open(tared_dir, 'r') as tar_file:
-            tar_file.extractall(dest_path)
-
-
-# Must only be used to pack directories in build root
-# Must silently accept empty list of dirs and do nothing in such case (workaround for ymake.core.conf limitations)
-def main(args):
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--pack', action='store_true', default=False)
-    parser.add_argument('--unpack', action='store_true', default=False)
-    parser.add_argument('--ext')
-    parser.add_argument('--outs', nargs='*', default=[])
-    parser.add_argument('dirs', nargs='*')
-    args = parser.parse_args(args)
-
-    if args.pack:
-        if len(args.dirs) != len(args.outs):
-            print("Number and oder of dirs to pack must match to the number and order of outs", file=sys.stderr)
-            return 1
-        for dir, dest in zip(args.dirs, args.outs):
-            pack_dir(dir, dest)
-    elif args.unpack:
-        for tared_dir in args.dirs:
-            if not tared_dir.endswith(args.ext):
-                print("Requested to unpack '{}' which do not have required extension '{}'".format(tared_dir, args.ext), file=sys.stderr)
-                return 1
-            dest = os.path.dirname(tared_dir)
-            unpack_dir(tared_dir, dest)
-    else:
-        print("Neither --pack nor --unpack specified. Don't know what to do.", file=sys.stderr)
-        return 1
-
-    return 0
-
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv[1:]))
+from __future__ import print_function 
+ 
+import os 
+import sys 
+import argparse 
+import tarfile 
+import subprocess 
+ 
+ 
+def is_exe(fpath): 
+    return os.path.isfile(fpath) and os.access(fpath, os.X_OK) 
+ 
+ 
+def pack_dir(dir_path, dest_path): 
+    dir_path = os.path.abspath(dir_path) 
+    for tar_exe in ('/usr/bin/tar', '/bin/tar'): 
+        if is_exe(tar_exe): 
+            subprocess.check_call([tar_exe, '-cf', dest_path, '-C', os.path.dirname(dir_path), os.path.basename(dir_path)]) 
+            break 
+    else: 
+        with tarfile.open(dest_path, 'w') as out: 
+            out.add(dir_path, arcname=os.path.basename(dir_path)) 
+ 
+ 
+def unpack_dir(tared_dir, dest_path): 
+    tared_dir = os.path.abspath(tared_dir) 
+    if not os.path.exists(dest_path): 
+        os.makedirs(dest_path) 
+    for tar_exe in ('/usr/bin/tar', '/bin/tar'): 
+        if is_exe(tar_exe): 
+            subprocess.check_call([tar_exe, '-xf', tared_dir, '-C', dest_path]) 
+            break 
+    else: 
+        with tarfile.open(tared_dir, 'r') as tar_file: 
+            tar_file.extractall(dest_path) 
+ 
+ 
+# Must only be used to pack directories in build root 
+# Must silently accept empty list of dirs and do nothing in such case (workaround for ymake.core.conf limitations) 
+def main(args): 
+    parser = argparse.ArgumentParser() 
+    parser.add_argument('--pack', action='store_true', default=False) 
+    parser.add_argument('--unpack', action='store_true', default=False) 
+    parser.add_argument('--ext') 
+    parser.add_argument('--outs', nargs='*', default=[]) 
+    parser.add_argument('dirs', nargs='*') 
+    args = parser.parse_args(args) 
+ 
+    if args.pack: 
+        if len(args.dirs) != len(args.outs): 
+            print("Number and oder of dirs to pack must match to the number and order of outs", file=sys.stderr) 
+            return 1 
+        for dir, dest in zip(args.dirs, args.outs): 
+            pack_dir(dir, dest) 
+    elif args.unpack: 
+        for tared_dir in args.dirs: 
+            if not tared_dir.endswith(args.ext): 
+                print("Requested to unpack '{}' which do not have required extension '{}'".format(tared_dir, args.ext), file=sys.stderr) 
+                return 1 
+            dest = os.path.dirname(tared_dir) 
+            unpack_dir(tared_dir, dest) 
+    else: 
+        print("Neither --pack nor --unpack specified. Don't know what to do.", file=sys.stderr) 
+        return 1 
+ 
+    return 0 
+ 
+ 
+if __name__ == '__main__': 
+    sys.exit(main(sys.argv[1:])) 
diff --git a/build/scripts/build_java_codenav_index.py b/build/scripts/build_java_codenav_index.py
index d7ac4f3213..9775207ab0 100644
--- a/build/scripts/build_java_codenav_index.py
+++ b/build/scripts/build_java_codenav_index.py
@@ -22,7 +22,7 @@ def modify_sources_file(origin, target, source_roots_map):
 
 
 def just_do_it(argv):
-    corpus_name, build_root, arcadia_root, sources_file, javac_tail_cmd = argv[0], argv[1], argv[2], argv[3], argv[4:]
+    corpus_name, build_root, arcadia_root, sources_file, javac_tail_cmd = argv[0], argv[1], argv[2], argv[3], argv[4:] 
     fake_arcadia_root = os.path.join(build_root, FAKE_ARCADIA_ROOT)
     fake_build_root = os.path.join(build_root, FAKE_BUILD_ROOT)
     fake_source_roots = {
@@ -40,7 +40,7 @@ def just_do_it(argv):
     os.symlink(arcadia_root, fake_arcadia_root)
     os.symlink(build_root, fake_build_root)
     try:
-        subprocess.check_call(javac_tail_cmd, env=env)
+        subprocess.check_call(javac_tail_cmd, env=env) 
     finally:
         os.unlink(fake_arcadia_root)
         os.unlink(fake_build_root)
diff --git a/build/scripts/find_and_tar.py b/build/scripts/find_and_tar.py
index f251623c68..bc3478d4fd 100644
--- a/build/scripts/find_and_tar.py
+++ b/build/scripts/find_and_tar.py
@@ -12,7 +12,7 @@ def find_gcno(dirname, tail):
 
 def main(args):
     output = args[0]
-    tail = args[1] if len(args) > 1 else ''
+    tail = args[1] if len(args) > 1 else '' 
     with tarfile.open(output, 'w:') as tf:
         for f in find_gcno(os.getcwd(), tail):
             tf.add(f)
diff --git a/build/scripts/fix_java_command_file_cp.py b/build/scripts/fix_java_command_file_cp.py
index fc87048c32..4ea41b518f 100644
--- a/build/scripts/fix_java_command_file_cp.py
+++ b/build/scripts/fix_java_command_file_cp.py
@@ -15,7 +15,7 @@ def fix_files(args):
             with open(arg[1:]) as f:
                 fixed = [i.strip() for i in f]
                 if args.build_root:
-                    fixed = [os.path.join(args.build_root, i) for ln in fixed for i in ln.split(os.path.pathsep)]
+                    fixed = [os.path.join(args.build_root, i) for ln in fixed for i in ln.split(os.path.pathsep)] 
                 fixed = os.pathsep.join([i.strip() for i in fixed])
             fixed_name = list(os.path.splitext(arg))
             fixed_name[0] += '_fixed'
diff --git a/build/scripts/fs_tools.py b/build/scripts/fs_tools.py
index dec4c349c8..f58cce00b6 100644
--- a/build/scripts/fs_tools.py
+++ b/build/scripts/fs_tools.py
@@ -1,28 +1,28 @@
-from __future__ import print_function
-
+from __future__ import print_function 
+ 
 import os
 import platform
 import sys
 import shutil
-import errno
+import errno 
 
 import process_command_files as pcf
 
 
-def link_or_copy(src, dst):
-    try:
-        if platform.system().lower() == 'windows':
-            shutil.copy(src, dst)
-        else:
-            os.link(src, dst)
-    except OSError as e:
-        if e.errno == errno.EEXIST:
-            print('link_or_copy: destination file already exists: {}'.format(dst), file=sys.stderr)
-        if e.errno == errno.ENOENT:
-            print('link_or_copy: source file doesn\'t exists: {}'.format(src), file=sys.stderr)
-        raise
-
-
+def link_or_copy(src, dst): 
+    try: 
+        if platform.system().lower() == 'windows': 
+            shutil.copy(src, dst) 
+        else: 
+            os.link(src, dst) 
+    except OSError as e: 
+        if e.errno == errno.EEXIST: 
+            print('link_or_copy: destination file already exists: {}'.format(dst), file=sys.stderr) 
+        if e.errno == errno.ENOENT: 
+            print('link_or_copy: source file doesn\'t exists: {}'.format(src), file=sys.stderr) 
+        raise 
+ 
+ 
 if __name__ == '__main__':
     mode = sys.argv[1]
     args = pcf.get_args(sys.argv[2:])
@@ -79,17 +79,17 @@ if __name__ == '__main__':
             except OSError:
                 pass
     elif mode == 'link_or_copy':
-        link_or_copy(args[0], args[1])
-    elif mode == 'link_or_copy_to_dir':
-        assert len(args) > 1
+        link_or_copy(args[0], args[1]) 
+    elif mode == 'link_or_copy_to_dir': 
+        assert len(args) > 1 
         start = 0
         if args[0] == '--no-check':
             if args == 2:
                 sys.exit()
             start = 1
-        dst = args[-1]
+        dst = args[-1] 
         for src in args[start:-1]:
-            link_or_copy(src, os.path.join(dst, os.path.basename(src)))
+            link_or_copy(src, os.path.join(dst, os.path.basename(src))) 
     elif mode == 'cat':
         with open(args[0], 'w') as dst:
             for input_name in args[1:]:
diff --git a/build/scripts/java_pack_to_file.py b/build/scripts/java_pack_to_file.py
index 8d2aeb93fd..28273b8baf 100644
--- a/build/scripts/java_pack_to_file.py
+++ b/build/scripts/java_pack_to_file.py
@@ -20,16 +20,16 @@ def get_package_name(filename):
     return ''
 
 
-def write_coverage_sources(output, srcroot, files):
-    with open(output, 'w') as afile:
-        for filename in files:
-            pname = get_package_name(os.path.join(srcroot, filename))
-            afile.write(os.path.join(pname, os.path.basename(filename)) + ':' + filename + '\n')
-
-
+def write_coverage_sources(output, srcroot, files): 
+    with open(output, 'w') as afile: 
+        for filename in files: 
+            pname = get_package_name(os.path.join(srcroot, filename)) 
+            afile.write(os.path.join(pname, os.path.basename(filename)) + ':' + filename + '\n') 
+ 
+ 
 def main():
     opts, files = parse_args()
-    write_coverage_sources(opts.output, opts.source_root, files)
+    write_coverage_sources(opts.output, opts.source_root, files) 
 
 
 if __name__ == '__main__':
diff --git a/build/scripts/make_java_classpath_file.py b/build/scripts/make_java_classpath_file.py
index c70a7876d7..c958356988 100644
--- a/build/scripts/make_java_classpath_file.py
+++ b/build/scripts/make_java_classpath_file.py
@@ -1,9 +1,9 @@
 import os
 import sys
 
-import process_command_files as pcf
-
+import process_command_files as pcf 
 
+ 
 def make_cp_file(args):
     source = args[0]
     destination = args[1]
@@ -12,15 +12,15 @@ def make_cp_file(args):
     with open(destination, 'w') as dst:
         dst.write(os.pathsep.join(lines))
 
-def make_cp_file_from_args(args):
-    destination = args[0]
-    with open(destination, 'w') as dst:
-        dst.write(os.pathsep.join(args[1:]))
-
+def make_cp_file_from_args(args): 
+    destination = args[0] 
+    with open(destination, 'w') as dst: 
+        dst.write(os.pathsep.join(args[1:])) 
 
+ 
 if __name__ == '__main__':
-    args = pcf.get_args(sys.argv[1:])
-    if sys.argv[1] != '--from-args':
-        make_cp_file(args)
-    else:
-        make_cp_file_from_args(args[1:])
+    args = pcf.get_args(sys.argv[1:]) 
+    if sys.argv[1] != '--from-args': 
+        make_cp_file(args) 
+    else: 
+        make_cp_file_from_args(args[1:]) 
diff --git a/build/scripts/make_java_srclists.py b/build/scripts/make_java_srclists.py
index f1dc807f7d..619c9cf9dd 100644
--- a/build/scripts/make_java_srclists.py
+++ b/build/scripts/make_java_srclists.py
@@ -1,122 +1,122 @@
-import os
-import sys
-import argparse
-
-import process_command_files as pcf
-import java_pack_to_file as jcov
-
-
-def writelines(f, rng):
-    f.writelines(item + '\n' for item in rng)
-
-
-def main():
-    args = pcf.get_args(sys.argv[1:])
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--moddir')
-    parser.add_argument('--java')
-    parser.add_argument('--groovy')
-    parser.add_argument('--kotlin')
-    parser.add_argument('--coverage')
-    parser.add_argument('--source-root')
-    args, remaining_args = parser.parse_known_args(args)
-
-    java = []
-    kotlin = []
-    groovy = []
-    coverage = []
-
-    cur_resources_list_file = None
-    cur_jsources_list_file = None
-    cur_srcdir = None
-    cur_resources = []
-    cur_jsources = []
-
-    FILE_ARG = 1
-    RESOURCES_DIR_ARG = 2
-    SRCDIR_ARG = 3
-    JSOURCES_DIR_ARG = 4
-
-    next_arg=FILE_ARG
-
-    for src in remaining_args:
-        if next_arg == RESOURCES_DIR_ARG:
-            assert cur_resources_list_file is None
-            cur_resources_list_file = src
-            next_arg = FILE_ARG
-            continue
-        elif next_arg == JSOURCES_DIR_ARG:
-            assert cur_jsources_list_file is None
-            cur_jsources_list_file = src
-            next_arg = FILE_ARG
-            continue
-        elif next_arg == SRCDIR_ARG:
-            assert cur_srcdir is None
-            cur_srcdir = src if os.path.isabs(src) else os.path.join(args.moddir, src)
-            next_arg = FILE_ARG
-            continue
-
-        if src.endswith(".java"):
-            java.append(src)
-            kotlin.append(src)
-            if args.coverage and args.source_root:
-                rel = os.path.relpath(src, args.source_root)
-                if not rel.startswith('..' + os.path.sep):
-                    coverage.append(rel)
-        elif args.kotlin and src.endswith(".kt"):
-            kotlin.append(src)
-        elif args.groovy and src.endswith(".groovy"):
-            groovy.append(src)
-        else:
-            if src == '--resources':
-                if cur_resources_list_file is not None:
-                    with open(cur_resources_list_file, 'w') as f:
-                        writelines(f, cur_resources)
-                cur_resources_list_file = None
-                cur_srcdir = None
-                cur_resources = []
-                next_arg = RESOURCES_DIR_ARG
-                continue
-            if src == '--jsources':
-                if cur_jsources_list_file is not None:
-                    with open(cur_jsources_list_file, 'w') as f:
-                        writelines(f, cur_jsources)
-                cur_jsources_list_file = None
-                cur_jsources = []
-                next_arg = JSOURCES_DIR_ARG
-                continue
-            elif src == '--srcdir':
-                next_arg = SRCDIR_ARG
-                continue
-            else:
-                assert cur_srcdir is not None and cur_resources_list_file is not None
-                cur_resources.append(os.path.relpath(src, cur_srcdir))
-
-        if cur_jsources_list_file is not None:
-            assert cur_srcdir is not None
-            cur_jsources.append(os.path.relpath(src, cur_srcdir))
-
-    if cur_resources_list_file is not None:
-        with open(cur_resources_list_file, 'w') as f:
-            writelines(f, cur_resources)
-    if cur_jsources_list_file is not None:
-        with open(cur_jsources_list_file, 'w') as f:
-            writelines(f, cur_jsources)
-
-    if args.java:
-        with open(args.java, 'w') as f:
-            writelines(f, java)
-    if args.kotlin:
-        with open(args.kotlin, 'w') as f:
-            writelines(f, kotlin)
-    if args.groovy:
-        with open(args.groovy, 'w') as f:
-            writelines(f, groovy)
-    if args.coverage:
-        jcov.write_coverage_sources(args.coverage, args.source_root, coverage)
-
-    return 0
-
-
-if __name__ == '__main__':
-    sys.exit(main())
\ No newline at end of file
+import os 
+import sys 
+import argparse 
+ 
+import process_command_files as pcf 
+import java_pack_to_file as jcov 
+ 
+ 
+def writelines(f, rng): 
+    f.writelines(item + '\n' for item in rng) 
+ 
+ 
+def main(): 
+    args = pcf.get_args(sys.argv[1:]) 
+    parser = argparse.ArgumentParser() 
+    parser.add_argument('--moddir') 
+    parser.add_argument('--java') 
+    parser.add_argument('--groovy') 
+    parser.add_argument('--kotlin') 
+    parser.add_argument('--coverage') 
+    parser.add_argument('--source-root') 
+    args, remaining_args = parser.parse_known_args(args) 
+ 
+    java = [] 
+    kotlin = [] 
+    groovy = [] 
+    coverage = [] 
+ 
+    cur_resources_list_file = None 
+    cur_jsources_list_file = None 
+    cur_srcdir = None 
+    cur_resources = [] 
+    cur_jsources = [] 
+ 
+    FILE_ARG = 1 
+    RESOURCES_DIR_ARG = 2 
+    SRCDIR_ARG = 3 
+    JSOURCES_DIR_ARG = 4 
+ 
+    next_arg=FILE_ARG 
+ 
+    for src in remaining_args: 
+        if next_arg == RESOURCES_DIR_ARG: 
+            assert cur_resources_list_file is None 
+            cur_resources_list_file = src 
+            next_arg = FILE_ARG 
+            continue 
+        elif next_arg == JSOURCES_DIR_ARG: 
+            assert cur_jsources_list_file is None 
+            cur_jsources_list_file = src 
+            next_arg = FILE_ARG 
+            continue 
+        elif next_arg == SRCDIR_ARG: 
+            assert cur_srcdir is None 
+            cur_srcdir = src if os.path.isabs(src) else os.path.join(args.moddir, src) 
+            next_arg = FILE_ARG 
+            continue 
+ 
+        if src.endswith(".java"): 
+            java.append(src) 
+            kotlin.append(src) 
+            if args.coverage and args.source_root: 
+                rel = os.path.relpath(src, args.source_root) 
+                if not rel.startswith('..' + os.path.sep): 
+                    coverage.append(rel) 
+        elif args.kotlin and src.endswith(".kt"): 
+            kotlin.append(src) 
+        elif args.groovy and src.endswith(".groovy"): 
+            groovy.append(src) 
+        else: 
+            if src == '--resources': 
+                if cur_resources_list_file is not None: 
+                    with open(cur_resources_list_file, 'w') as f: 
+                        writelines(f, cur_resources) 
+                cur_resources_list_file = None 
+                cur_srcdir = None 
+                cur_resources = [] 
+                next_arg = RESOURCES_DIR_ARG 
+                continue 
+            if src == '--jsources': 
+                if cur_jsources_list_file is not None: 
+                    with open(cur_jsources_list_file, 'w') as f: 
+                        writelines(f, cur_jsources) 
+                cur_jsources_list_file = None 
+                cur_jsources = [] 
+                next_arg = JSOURCES_DIR_ARG 
+                continue 
+            elif src == '--srcdir': 
+                next_arg = SRCDIR_ARG 
+                continue 
+            else: 
+                assert cur_srcdir is not None and cur_resources_list_file is not None 
+                cur_resources.append(os.path.relpath(src, cur_srcdir)) 
+ 
+        if cur_jsources_list_file is not None: 
+            assert cur_srcdir is not None 
+            cur_jsources.append(os.path.relpath(src, cur_srcdir)) 
+ 
+    if cur_resources_list_file is not None: 
+        with open(cur_resources_list_file, 'w') as f: 
+            writelines(f, cur_resources) 
+    if cur_jsources_list_file is not None: 
+        with open(cur_jsources_list_file, 'w') as f: 
+            writelines(f, cur_jsources) 
+ 
+    if args.java: 
+        with open(args.java, 'w') as f: 
+            writelines(f, java) 
+    if args.kotlin: 
+        with open(args.kotlin, 'w') as f: 
+            writelines(f, kotlin) 
+    if args.groovy: 
+        with open(args.groovy, 'w') as f: 
+            writelines(f, groovy) 
+    if args.coverage: 
+        jcov.write_coverage_sources(args.coverage, args.source_root, coverage) 
+ 
+    return 0 
+ 
+ 
+if __name__ == '__main__': 
+    sys.exit(main()) 
\ No newline at end of file
diff --git a/build/scripts/resolve_java_srcs.py b/build/scripts/resolve_java_srcs.py
index a2e6c20012..fe29700e32 100644
--- a/build/scripts/resolve_java_srcs.py
+++ b/build/scripts/resolve_java_srcs.py
@@ -65,11 +65,11 @@ def resolve_java_srcs(srcdir, include_patterns, exclude_patterns, all_resources,
                     if all_resources or not (f.endswith('.java') or f.endswith('.kt') or f.endswith('.groovy')):
                         result['not_java'].append(s)
                     elif f.endswith('.java'):
-                        result['java'].append(os.path.join(srcdir, s))
+                        result['java'].append(os.path.join(srcdir, s)) 
                     elif f.endswith('.kt') and resolve_kotlin:
-                        result['kotlin'].append(os.path.join(srcdir, s))
+                        result['kotlin'].append(os.path.join(srcdir, s)) 
                     elif f.endswith('.groovy') and resolve_groovy:
-                        result['groovy'].append(os.path.join(srcdir, s))
+                        result['groovy'].append(os.path.join(srcdir, s)) 
                     else:
                         result['not_java'].append(s)
                     break
@@ -77,15 +77,15 @@ def resolve_java_srcs(srcdir, include_patterns, exclude_patterns, all_resources,
     return sorted(result['java']), sorted(result['not_java']), sorted(result['kotlin']), sorted(result['groovy'])
 
 
-def do_it(directory, sources_file, resources_file, kotlin_sources_file, groovy_sources_file, include_patterns, exclude_patterns, resolve_kotlin, resolve_groovy, append, all_resources):
-    j, r, k, g = resolve_java_srcs(directory, include_patterns, exclude_patterns, all_resources, resolve_kotlin, resolve_groovy)
-    mode = 'a' if append else 'w'
-    open(sources_file, mode).writelines(i + '\n' for i in j)
-    open(resources_file, mode).writelines(i + '\n' for i in r)
+def do_it(directory, sources_file, resources_file, kotlin_sources_file, groovy_sources_file, include_patterns, exclude_patterns, resolve_kotlin, resolve_groovy, append, all_resources): 
+    j, r, k, g = resolve_java_srcs(directory, include_patterns, exclude_patterns, all_resources, resolve_kotlin, resolve_groovy) 
+    mode = 'a' if append else 'w' 
+    open(sources_file, mode).writelines(i + '\n' for i in j) 
+    open(resources_file, mode).writelines(i + '\n' for i in r) 
     if kotlin_sources_file:
-        open(kotlin_sources_file, mode).writelines(i + '\n' for i in k + j)
+        open(kotlin_sources_file, mode).writelines(i + '\n' for i in k + j) 
     if groovy_sources_file:
-        open(groovy_sources_file, mode).writelines(i + '\n' for i in g + j)
+        open(groovy_sources_file, mode).writelines(i + '\n' for i in g + j) 
 
 
 if __name__ == '__main__':
@@ -95,8 +95,8 @@ if __name__ == '__main__':
     parser.add_argument('-r', '--resources-file', required=True)
     parser.add_argument('-k', '--kotlin-sources-file', default=None)
     parser.add_argument('-g', '--groovy-sources-file', default=None)
-    parser.add_argument('--append', action='store_true', default=False)
-    parser.add_argument('--all-resources',  action='store_true', default=False)
+    parser.add_argument('--append', action='store_true', default=False) 
+    parser.add_argument('--all-resources',  action='store_true', default=False) 
     parser.add_argument('--resolve-kotlin',  action='store_true', default=False)
     parser.add_argument('--resolve-groovy', action='store_true', default=False)
     parser.add_argument('--include-patterns', nargs='*', default=[])
diff --git a/build/scripts/writer.py b/build/scripts/writer.py
index 21bb3006e5..6c7e4f0e4e 100644
--- a/build/scripts/writer.py
+++ b/build/scripts/writer.py
@@ -1,20 +1,20 @@
-import sys
-import argparse
-
-import process_command_files as pcf
+import sys 
+import argparse 
 
+import process_command_files as pcf 
 
+ 
 def parse_args():
-    args = pcf.get_args(sys.argv[1:])
-    parser = argparse.ArgumentParser()
-    parser.add_argument('-f', '--file', dest='file_path')
-    parser.add_argument('-a', '--append', action='store_true', default=False)
-    parser.add_argument('-Q', '--quote', action='store_true', default=False)
-    parser.add_argument('-s', '--addspace', action='store_true', default=False)
-    parser.add_argument('-c', '--content', action='append', dest='content')
-    parser.add_argument('-m', '--content-multiple', nargs='*', dest='content')
-    parser.add_argument('-P', '--path-list', action='store_true', default=False)
-    return parser.parse_args(args)
+    args = pcf.get_args(sys.argv[1:]) 
+    parser = argparse.ArgumentParser() 
+    parser.add_argument('-f', '--file', dest='file_path') 
+    parser.add_argument('-a', '--append', action='store_true', default=False) 
+    parser.add_argument('-Q', '--quote', action='store_true', default=False) 
+    parser.add_argument('-s', '--addspace', action='store_true', default=False) 
+    parser.add_argument('-c', '--content', action='append', dest='content') 
+    parser.add_argument('-m', '--content-multiple', nargs='*', dest='content') 
+    parser.add_argument('-P', '--path-list', action='store_true', default=False) 
+    return parser.parse_args(args) 
 
 
 def smart_shell_quote(v):
@@ -25,16 +25,16 @@ def smart_shell_quote(v):
     return v
 
 if __name__ == '__main__':
-    args = parse_args()
-    open_type = 'a' if args.append else 'w'
+    args = parse_args() 
+    open_type = 'a' if args.append else 'w' 
 
-    content = args.content
-    if args.quote:
-        content = [smart_shell_quote(ln) for ln in content] if content is not None else None
-    content = '\n'.join(content)
+    content = args.content 
+    if args.quote: 
+        content = [smart_shell_quote(ln) for ln in content] if content is not None else None 
+    content = '\n'.join(content) 
 
-    with open(args.file_path, open_type) as f:
-        if args.addspace:
+    with open(args.file_path, open_type) as f: 
+        if args.addspace: 
             f.write(' ')
         if content is not None:
             f.write(content)
diff --git a/build/sysincl/misc-win.yml b/build/sysincl/misc-win.yml
index e53d4be782..f5ce09fe5a 100644
--- a/build/sysincl/misc-win.yml
+++ b/build/sysincl/misc-win.yml
@@ -1,4 +1,4 @@
-- source_filter: "^(contrib/libs/(ImageMagick|ffmpeg-3|libraw|pthreads_win32|zookeeper))|^contrib/restricted/boost"
+- source_filter: "^(contrib/libs/(ImageMagick|ffmpeg-3|libraw|pthreads_win32|zookeeper))|^contrib/restricted/boost" 
   includes:
   - pthread.h:     contrib/libs/pthreads_win32/include/pthread.h
   - sched.h:       contrib/libs/pthreads_win32/include/sched.h
diff --git a/build/sysincl/misc.yml b/build/sysincl/misc.yml
index e9e6095888..d8b5751cef 100644
--- a/build/sysincl/misc.yml
+++ b/build/sysincl/misc.yml
@@ -369,11 +369,11 @@
   includes:
     - lzma.h
 
-- source_filter: "^contrib/libs/(kyotocabinet|minilzo)"
+- source_filter: "^contrib/libs/(kyotocabinet|minilzo)" 
   includes:
     - lzo/lzo1x.h
 
-- source_filter: "^contrib/libs/(gtest|libpng|opencv)"
+- source_filter: "^contrib/libs/(gtest|libpng|opencv)" 
   includes:
     - mem.h
 
@@ -389,7 +389,7 @@
   includes:
     - png.h
 
-- source_filter: "^(contrib/restricted/boost/boost/mpi|catboost/cuda/cuda_lib/mpi)"
+- source_filter: "^(contrib/restricted/boost/boost/mpi|catboost/cuda/cuda_lib/mpi)" 
   includes:
     - mpi.h
 
diff --git a/build/sysincl/system-jdk.yml b/build/sysincl/system-jdk.yml
index d894941ad4..bdd66e6fd6 100644
--- a/build/sysincl/system-jdk.yml
+++ b/build/sysincl/system-jdk.yml
@@ -1,2 +1,2 @@
-- includes:
-  - jni.h
\ No newline at end of file
+- includes: 
+  - jni.h 
\ No newline at end of file
diff --git a/build/ya.conf.json b/build/ya.conf.json
index 5f7cc875d6..7f52521173 100644
--- a/build/ya.conf.json
+++ b/build/ya.conf.json
@@ -6478,7 +6478,7 @@
         "scriptgen": {
             "formula": {
                 "sandbox_id": [
-                    1164520637
+                    1164520637 
                 ],
                 "match": "SCRIPTGEN"
             }
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 081833998b..e7078bcf4c 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -301,7 +301,7 @@ ENUM_PARSER_TOOL=${tool:"tools/enum_parser/enum_parser"}
 
 # tag:python-specific tag:cython-specific
 CYTHON_SCRIPT=${input:"${ARCADIA_ROOT}/contrib/tools/cython/cython.py"}
-RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT
+RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT 
 CYTHON_OUTPUT_INCLUDES=\
 ${output_include;hide:"contrib/libs/python/Include/compile.h"} \
 ${output_include;hide:"contrib/libs/python/Include/frameobject.h"} \
@@ -310,13 +310,13 @@ ${output_include;hide:"contrib/libs/python/Include/pyconfig.h"} \
 ${output_include;hide:"contrib/libs/python/Include/Python.h"} \
 ${output_include;hide:"contrib/libs/python/Include/pythread.h"} \
 ${output_include;hide:"contrib/libs/python/Include/structmember.h"} \
-${output_include;hide:"contrib/libs/python/Include/traceback.h"} \
+${output_include;hide:"contrib/libs/python/Include/traceback.h"} \ 
 ${output_include;hide:"contrib/tools/cython/generated_c_headers.h"} \
 ${output_include;hide:"omp.h"}
 
 # tag:cython-specific
-CYTHON_CPP_OUTPUT_INCLUDES=${output_include;hide:"contrib/tools/cython/generated_cpp_headers.h"}
-
+CYTHON_CPP_OUTPUT_INCLUDES=${output_include;hide:"contrib/tools/cython/generated_cpp_headers.h"} 
+ 
 # tag:cython-specific
 CYTHON_OPTIONS=
 when ($OS_LINUX) {
@@ -398,13 +398,13 @@ when ($USE_SYSTEM_PYTHON) {
 }
 
 # tag:python-specific
-YMAKE_PYTHON3_PEER=build/platform/python/ymake_python3
-YMAKE_PYTHON3=$YMAKE_PYTHON3_RESOURCE_GLOBAL/python3
-when ($HOST_OS_WINDOWS == "yes") {
-    YMAKE_PYTHON3=$YMAKE_PYTHON3_RESOURCE_GLOBAL/python3.exe
-}
-
-# tag:python-specific
+YMAKE_PYTHON3_PEER=build/platform/python/ymake_python3 
+YMAKE_PYTHON3=$YMAKE_PYTHON3_RESOURCE_GLOBAL/python3 
+when ($HOST_OS_WINDOWS == "yes") { 
+    YMAKE_PYTHON3=$YMAKE_PYTHON3_RESOURCE_GLOBAL/python3.exe 
+} 
+ 
+# tag:python-specific 
 when ($USE_ARCADIA_PYTHON == "no") {
     SYSINCL+=build/sysincl/python.yml
 }
@@ -446,40 +446,40 @@ macro CHECK_CONFIG_H(Conf) {
     OUTPUT_INCLUDES=$Conf
 }
 
-REQUIRED_TRANSITIVE_PEERS=
-### @usage REQUIRES(dirs...)
-###
-### Specify list of dirs which this module must depend on indirectly.
-###
-### This macro can be used if module depends on the directories specified but they can't be listed
-### as direct PEERDIR dependencies (due to public include order or link order issues).
-macro REQUIRES(DIRS[]) {
-    SET_APPEND(REQUIRED_TRANSITIVE_PEERS $DIRS)
-}
-
-CHECK_DEPENDENT_DIRS_TYPES=
-CHECK_DEPENDENT_DIRS_RESTRICTIONS=
-### @usage CHECK_DEPENDENT_DIRS(DENY|ALLOW_ONLY ([ALL|PEERDIRS|GLOB] dir)...)
-###
-### Specify project transitive dependencies constraints.
-###
-### @params:
-###  1. DENY: current module can not depend on module from any specified directory neither directly nor transitively.
-###  2. ALLOW_ONLY: current module can not depend on module from a dir not specified in the directory list neither directly nor transitively.
-###  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.
-###
-### Direcory 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)
-macro CHECK_DEPENDENT_DIRS(TYPE, ALL?"UNUSED":"", PEERDIRS?"PEERDIRS":"ALL", RESTRICTIONS...) {
-    SET_APPEND(CHECK_DEPENDENT_DIRS_RESTRICTIONS $PEERDIRS $RESTRICTIONS)
-    SET_APPEND(CHECK_DEPENDENT_DIRS_TYPES $TYPE)
-}
-
+REQUIRED_TRANSITIVE_PEERS= 
+### @usage REQUIRES(dirs...) 
+### 
+### Specify list of dirs which this module must depend on indirectly. 
+### 
+### This macro can be used if module depends on the directories specified but they can't be listed 
+### as direct PEERDIR dependencies (due to public include order or link order issues). 
+macro REQUIRES(DIRS[]) { 
+    SET_APPEND(REQUIRED_TRANSITIVE_PEERS $DIRS) 
+} 
+ 
+CHECK_DEPENDENT_DIRS_TYPES= 
+CHECK_DEPENDENT_DIRS_RESTRICTIONS= 
+### @usage CHECK_DEPENDENT_DIRS(DENY|ALLOW_ONLY ([ALL|PEERDIRS|GLOB] dir)...) 
+### 
+### Specify project transitive dependencies constraints. 
+### 
+### @params: 
+###  1. DENY: current module can not depend on module from any specified directory neither directly nor transitively. 
+###  2. ALLOW_ONLY: current module can not depend on module from a dir not specified in the directory list neither directly nor transitively. 
+###  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. 
+### 
+### Direcory 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) 
+macro CHECK_DEPENDENT_DIRS(TYPE, ALL?"UNUSED":"", PEERDIRS?"PEERDIRS":"ALL", RESTRICTIONS...) { 
+    SET_APPEND(CHECK_DEPENDENT_DIRS_RESTRICTIONS $PEERDIRS $RESTRICTIONS) 
+    SET_APPEND(CHECK_DEPENDENT_DIRS_TYPES $TYPE) 
+} 
+ 
 # tag:proto
 PY_PROTOS_FOR=no
 BUILD_PROTO_AS_EVLOG=no
@@ -521,12 +521,12 @@ OPTIMIZE_PY_PROTOS_FLAG=no
 ### Add data (resources, random files, strings) to the program)
 ### The common usage is to place Src file into binary. The Key is used to access it using library/cpp/resource or library/python/resource.
 ### Alternative syntax with '- Key=Value' allows placing Value string as resource data into binary and make it accessible by Key.
-###
+### 
 ### This is a simpler but less flexible option than ARCHIVE(), because in the case of ARCHIVE(), you have to use the data explicitly,
 ### and in the case of RESOURCE(), the data will fall through SRCS() or SRCS(GLOBAL) to binary linking.
-###
+### 
 ### Use the FORCE_TEXT parameter to explicitly mark all Src files as text files: they will not be parsed unless used elsewhere.
-###
+### 
 ### @example: https://wiki.yandex-team.ru/yatool/howtowriteyamakefiles/#a2ispolzujjtekomanduresource
 ###
 ### @example:
@@ -606,7 +606,7 @@ macro NO_OPTIMIZE_PY_PROTOS() {
 # tag:proto tag:python-specific
 macro _PROTO_PLUGIN_ARGS_BASE(Name, Tool, OutParm...) {
     .CMD=--plugin=protoc-gen-${Name}=\${tool:"$Tool"} --${Name}_out=$OutParm$ARCADIA_BUILD_ROOT/\$PROTO_NAMESPACE
-    .SEM=ignored
+    .SEM=ignored 
 }
 
 # tag:proto tag:python-specific
@@ -656,7 +656,7 @@ macro JAVA_PROTO_PLUGIN(NAME, TOOL, DEPS[]) {
 }
 
 # tag:proto tag:cpp-specific
-macro _ADD_CPP_PROTO_OUT(Suf) {
+macro _ADD_CPP_PROTO_OUT(Suf) { 
     SET_APPEND(CPP_PROTO_OUTS \${output;hide;norel;nopath;noext;suf=$Suf:File})
 
     # XXX fix variable expansion in plugins
@@ -673,12 +673,12 @@ CPP_PROTOBUF_PEERS=
 ### Define protoc plugin for C++ with given Name that emits code into regular outputs
 ### using Tool. Extra dependencies are passed via DEPS.
 macro CPP_PROTO_PLUGIN0(NAME, TOOL, DEPS[]) {
-    .SEM=target_proto_plugin $NAME ${tool;rootrel:TOOL} ${output;hide;suf=.fake.o:NAME}
+    .SEM=target_proto_plugin $NAME ${tool;rootrel:TOOL} ${output;hide;suf=.fake.o:NAME} 
     SET_APPEND(CPP_PROTO_OPTS $_PROTO_PLUGIN_ARGS_BASE($NAME $TOOL))
 
     # XXX fix variable expansion in plugins
     ENABLE(HAS_CPP_PROTOBUF_PEERS)
-    SET(CPP_PROTOBUF_PEERS $CPP_PROTOBUF_PEERS $DEPS)
+    SET(CPP_PROTOBUF_PEERS $CPP_PROTOBUF_PEERS $DEPS) 
 }
 
 # tag:proto tag:cpp-specific
@@ -688,7 +688,7 @@ macro CPP_PROTO_PLUGIN0(NAME, TOOL, DEPS[]) {
 ### using Tool. Extra dependencies are passed via DEPS.
 macro CPP_PROTO_PLUGIN(NAME, TOOL, SUF, DEPS[]) {
     CPP_PROTO_PLUGIN0($NAME $TOOL DEPS $DEPS)
-
+ 
     _ADD_CPP_PROTO_OUT($SUF)
 }
 
@@ -699,7 +699,7 @@ macro CPP_PROTO_PLUGIN(NAME, TOOL, SUF, DEPS[]) {
 ### using Tool. Extra dependencies are passed via DEPS.
 macro CPP_PROTO_PLUGIN2(NAME, TOOL, SUF1, SUF2, DEPS[]) {
     CPP_PROTO_PLUGIN($NAME $TOOL $SUF1 DEPS $DEPS)
-
+ 
     _ADD_CPP_PROTO_OUT($SUF2)
 }
 
@@ -847,7 +847,7 @@ macro YP_PROTO_YSON(OUT_OPTS[], Files...) {
 # tag:proto
 macro _CPP_PROTO_CMD(File) {
     .CMD=$CPP_PROTO_CMDLINE $CPP_PROTO_OPTS $CPP_PROTO_OUTS ${kv;hide:"p PB"} ${kv;hide:"pc yellow"}
-    .SEM=target_proto_mesages PRIVATE ${input:File} ${output;hide;suf=.pb.o:File} ${output;main;hide;norel;nopath;noext:File.pb.h} ${hide;tool:"contrib/tools/protoc/bin"} && set_global_flags COMMON_PROTOC_FLAGS -I=$ARCADIA_ROOT -I=$ARCADIA_BUILD_ROOT && modules_required protobuf.cmake
+    .SEM=target_proto_mesages PRIVATE ${input:File} ${output;hide;suf=.pb.o:File} ${output;main;hide;norel;nopath;noext:File.pb.h} ${hide;tool:"contrib/tools/protoc/bin"} && set_global_flags COMMON_PROTOC_FLAGS -I=$ARCADIA_ROOT -I=$ARCADIA_BUILD_ROOT && modules_required protobuf.cmake 
     .PEERDIR=contrib/libs/protobuf
 }
 
@@ -1267,8 +1267,8 @@ module _BASE_UNIT: _BARE_UNIT {
 
     # Adding PEERDIR from trigger doesn't always work. In this case it
     # cause troubles in contrib/libs/libc_compat/ubuntu_14 under musl
-    # Workaround this issue by setting variable with PEERDIR in trigger
-    # and then adding PEERDIR to it's value	unconditionally.
+    # Workaround this issue by setting variable with PEERDIR in trigger 
+    # and then adding PEERDIR to it's value	unconditionally. 
     when ($USE_UBUNTU_COMPATIBILITY == "yes" && $NEED_PLATFORM_PEERDIRS == "yes") {
         _UBUNTU_COMPAT_PEERDIR=contrib/libs/libc_compat/ubuntu_14
     }
@@ -1521,7 +1521,7 @@ elsewhen ($OS_DARWIN == "yes" || $OS_IOS == "yes") {
 }
 
 LINK_OR_COPY_SO_CMD=
-when ($SO_OUTPUTS == "yes") {
+when ($SO_OUTPUTS == "yes") { 
     LINK_OR_COPY_SO_CMD=$FS_TOOLS link_or_copy_to_dir --no-check $_SO_EXT_FILTER ${BINDIR}
     LDFLAGS+=$RPATH_GLOBAL
 }
@@ -1571,7 +1571,7 @@ macro LINK_EXEC_DYN_LIB_IMPL(WHOLE_ARCHIVE_PEERS...) {
 module _LINK_UNIT: _BASE_UNIT {
     .EXTS=.o .obj .supp .tidyjson .ld
     .CMD=LINK_EXE
-    .ALLOWED=EXTRALIBS OBJADDE_GLOBAL RESOURCE_FILES
+    .ALLOWED=EXTRALIBS OBJADDE_GLOBAL RESOURCE_FILES 
     .NODE_TYPE=Program
     .PEERDIR_POLICY=as_build_from
     .FINAL_TARGET=yes
@@ -1590,7 +1590,7 @@ module _LINK_UNIT: _BASE_UNIT {
     }
 
     ENABLE(COMMON_LINK_SETTINGS)
-    CHECK_PROVIDES()
+    CHECK_PROVIDES() 
 }
 
 MODULE_TYPE=UNKNOWN
@@ -1673,7 +1673,7 @@ CPP_PROGRAM_SEM=add_executable $MODDIR $REALPRJNAME ${hide:TARGET} ${hide:AUTO_I
 ### If name is not specified it will be generated from the name of the containing project directory.
 module PROGRAM: _BASE_PROGRAM {
     .ALIASES=REQUIREMENTS=CC_REQUIREMENTS
-    .SEM=CPP_PROGRAM_SEM
+    .SEM=CPP_PROGRAM_SEM 
 
     ADD_YTEST($MODULE_PREFIX$REALPRJNAME coverage.extractor)
     ADD_CLANG_TIDY()
@@ -1740,7 +1740,7 @@ multimodule PY3_PROGRAM {
     }
 
     module PY3_BIN_LIB: PY3_LIBRARY {
-        .IGNORED=RESTRICT_LICENSES
+        .IGNORED=RESTRICT_LICENSES 
         # Notify pybuild to skip all python main function definitions
         ENABLE(IGNORE_PY_MAIN)
         _REQUIRE_EXPLICIT_LICENSE()
@@ -2342,7 +2342,7 @@ when ($YA_DEV == "yes") {
 ###
 ### Documentation about the Arcadia test system: https://wiki.yandex-team.ru/yatool/test/
 module UNITTEST_FOR: UNITTEST {
-    .SEM=UNITTEST_SEM
+    .SEM=UNITTEST_SEM 
     PEERDIR(ADDINCL $UNITTEST_DIR)
     SRCDIR($UNITTEST_DIR)
 }
@@ -2357,7 +2357,7 @@ module _LIBRARY: _BASE_UNIT {
     .NODE_TYPE=Library
     .PEERDIR_POLICY=as_include
     .EXTS=.o .obj .a .mf .supp .tidyjson .ld
-    .ALLOWED=GRPC USE_SKIFF EXTRALIBS OBJADDE_GLOBAL RESOURCE_FILES
+    .ALLOWED=GRPC USE_SKIFF EXTRALIBS OBJADDE_GLOBAL RESOURCE_FILES 
     .GLOBAL=USER_CFLAGS USER_CXXFLAGS USER_CONLYFLAGS LDFLAGS SRCS _WHOLE_ARCHIVE_LIBS_VALUE RPATH
     .RESTRICTED=ALLOCATOR SIZE TAG DATA TEST_DATA DEPENDS FORK_TESTS FORK_SUBTESTS SPLIT_FACTOR TEST_CWD RUN TIMEOUT SPLIT_DWARF
     .FINAL_TARGET=no
@@ -2406,21 +2406,21 @@ module _LIBRARY: _BASE_UNIT {
 }
 
 CPP_LIBRARY_SEM=add_library ${MODDIR} $REALPRJNAME ${hide:TARGET} ${hide:AUTO_INPUT} \
-                && library_fake_marker FAKE_MODULE ${FAKE_MODULE} \
-                && consumer_link_library PUBLIC $CMAKE_LINK_TARGET \
-                && target_include_directories PUBLIC $_C__INCLUDE_GLOBAL \
-                && target_include_directories PRIVATE $_C__INCLUDE_OWNED \
-                && target_compile_definitions PRIVATE $USER_CFLAGS $USER_CXXFLAGS
+                && library_fake_marker FAKE_MODULE ${FAKE_MODULE} \ 
+                && consumer_link_library PUBLIC $CMAKE_LINK_TARGET \ 
+                && target_include_directories PUBLIC $_C__INCLUDE_GLOBAL \ 
+                && target_include_directories PRIVATE $_C__INCLUDE_OWNED \ 
+                && target_compile_definitions PRIVATE $USER_CFLAGS $USER_CXXFLAGS 
 CPP_OBJ_LIBRARY_SEM=add_global_library_for ${MODDIR} ${suf=.global:REALPRJNAME} $REALPRJNAME ${hide:GLOBAL_TARGET} ${hide:AUTO_INPUT} \
-                && target_include_directories PUBLIC $_C__INCLUDE_GLOBAL \
-                && target_include_directories PRIVATE $_C__INCLUDE_OWNED \
+                && target_include_directories PUBLIC $_C__INCLUDE_GLOBAL \ 
+                && target_include_directories PRIVATE $_C__INCLUDE_OWNED \ 
                 && target_compile_definitions PRIVATE $USER_CFLAGS $USER_CXXFLAGS
 
-CMAKE_FIND_PKG=
-CMAKE_LINK_TARGET=$REALPRJNAME
-CMAKE_FIND_PKG_COMP=
-CONAN_REQUIRE=
-
+CMAKE_FIND_PKG= 
+CMAKE_LINK_TARGET=$REALPRJNAME 
+CMAKE_FIND_PKG_COMP= 
+CONAN_REQUIRE= 
+ 
 ### @usage: LIBRARY()
 ###
 ### The regular static library module.
@@ -2436,24 +2436,24 @@ CONAN_REQUIRE=
 module LIBRARY: _LIBRARY {
     .GLOBAL=_AARS _PROGUARD_RULES
     .ALIASES=REQUIREMENTS=CC_REQUIREMENTS
-    .SEM=CPP_LIBRARY_SEM
-    .GLOBAL_SEM=CPP_OBJ_LIBRARY_SEM
-
-    when ($CMAKE_PACKAGE_COMPONENT != "") {
-        CMAKE_FIND_PKG_COMP=COMPONENTS $CMAKE_PACKAGE_COMPONENT
-    }
-    when ($CMAKE_PACKAGE != "") {
-        CMAKE_FIND_PKG=find_package $CMAKE_PACKAGE $CMAKE_FIND_PKG_COMP
-        CPP_LIBRARY_SEM=$CONAN_REQUIRE && $CMAKE_FIND_PKG && consumer_link_library PUBLIC $CMAKE_LINK_TARGET && ignored
-    }
-    when ($CONAN_REFERENCE != "") {
-        CONAN_REQUIRE=conan_require $CONAN_REFERENCE
-        CPP_LIBRARY_SEM=$CONAN_REQUIRE && $CMAKE_FIND_PKG && consumer_link_library PUBLIC $CMAKE_LINK_TARGET && ignored
-    }
-    when ($OPENSOURCE_EXPORT == "no") {
-        CPP_LIBRARY_SEM=ignored
-    }
-
+    .SEM=CPP_LIBRARY_SEM 
+    .GLOBAL_SEM=CPP_OBJ_LIBRARY_SEM 
+
+    when ($CMAKE_PACKAGE_COMPONENT != "") { 
+        CMAKE_FIND_PKG_COMP=COMPONENTS $CMAKE_PACKAGE_COMPONENT 
+    } 
+    when ($CMAKE_PACKAGE != "") { 
+        CMAKE_FIND_PKG=find_package $CMAKE_PACKAGE $CMAKE_FIND_PKG_COMP 
+        CPP_LIBRARY_SEM=$CONAN_REQUIRE && $CMAKE_FIND_PKG && consumer_link_library PUBLIC $CMAKE_LINK_TARGET && ignored 
+    } 
+    when ($CONAN_REFERENCE != "") { 
+        CONAN_REQUIRE=conan_require $CONAN_REFERENCE 
+        CPP_LIBRARY_SEM=$CONAN_REQUIRE && $CMAKE_FIND_PKG && consumer_link_library PUBLIC $CMAKE_LINK_TARGET && ignored 
+    } 
+    when ($OPENSOURCE_EXPORT == "no") { 
+        CPP_LIBRARY_SEM=ignored 
+    } 
+ 
     when ($HAS_CPP_PROTOBUF_PEERS == "yes") {
         PEERDIR+=$CPP_PROTOBUF_PEERS
     }
@@ -2498,7 +2498,7 @@ macro _CONDITIONAL_SRCS(USE_CONDITIONAL_SRCS[], DYMMY...) {
 
 # XXX: dirty hack for correct LDFLAGS passing
 RESOURCES_LIBRARY_LINK=$TOUCH_UNIT ${hide:LDFLAGS_GLOBAL} ${hide:LDFLAGS}
-RESOURCES_LIBRARY_SEM=ignored
+RESOURCES_LIBRARY_SEM=ignored 
 
 ### @usage: RESOURCES_LIBRARY()
 ###
@@ -2508,7 +2508,7 @@ RESOURCES_LIBRARY_SEM=ignored
 ### @see: [DECLARE_EXTERNAL_RESOURCE()](#macro_DECLARE_EXTERNAL_RESOURCE)
 module RESOURCES_LIBRARY: _BARE_UNIT {
     .CMD=RESOURCES_LIBRARY_LINK
-    .SEM=RESOURCES_LIBRARY_SEM
+    .SEM=RESOURCES_LIBRARY_SEM 
     .ALLOWED=DECLARE_EXTERNAL_RESOURCE EXTRALIBS OBJADDE_GLOBAL
     .RESTRICTED=ALLOCATOR SIZE TAG DATA TEST_DATA DEPENDS FORK_TESTS FORK_SUBTESTS SPLIT_FACTOR TEST_CWD RUN TIMEOUT SRC SRCS PEERDIR SPLIT_DWARF
     .NODE_TYPE=Library
@@ -2853,7 +2853,7 @@ module DEV_DLL_PROXY: _BARE_UNIT {
     .NODE_TYPE=Library
     .EXTS=.so .dll .dylib .mf
     .CMD=DLL_PROXY_CMD_MF
-    DYNAMIC_LINK=yes
+    DYNAMIC_LINK=yes 
 
     when ($OS_WINDOWS == "yes") {
         MODULE_SUFFIX=.dll
@@ -2915,7 +2915,7 @@ multimodule DYNAMIC_LIBRARY {
         .PEERDIRSELF=DLL_BIN
         .IGNORED=SRCS PEERDIR RUN_PROGRAM PYTHON DYNAMIC_LIBRARY_FROM GENERATE_ENUM_SERIALIZATION GENERATE_ENUM_SERIALIZATION_WITH_HEADER USE_PYTHON2 USE_PYTHON3
         .ALLOWED=DYNAMIC_DEPS
-
+ 
         SET(PEERDIR_TAGS DLL_LIB __EMPTY__)
 
         _BARE_MODULE()
@@ -3054,7 +3054,7 @@ TOUCH_DOCS_MF=$TOUCH_DOCS && $GENERATE_MF
 ### among .proto/.gztproto imports
 ###
 ### Note: it is currently impossible to enbale 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
+### 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() {
     SET(DONT_RESOLVE_INCLUDES no)
@@ -3383,12 +3383,12 @@ macro _SRCS_NO_GLOBAL(GLOBAL[], FILES...) {
 
 # tag:java-specific
 JAVA_VCS_MF_ARG=
-COMPILE_JAVA_MF=$COMPILE_JAVA
+COMPILE_JAVA_MF=$COMPILE_JAVA 
 
 # tag:java-specific
 when ($EXT_JAVA_VCS_INFO == "yes") {
     JAVA_VCS_MF_ARG=--vcs-mf $VCS_JAVA
-    COMPILE_JAVA_MF=$GENERATE_VCS_JAVA_INFO_NODEP && $COMPILE_JAVA
+    COMPILE_JAVA_MF=$GENERATE_VCS_JAVA_INFO_NODEP && $COMPILE_JAVA 
 }
 
 # tag:java-specific
@@ -3415,14 +3415,14 @@ module EXTERNAL_JAVA_LIBRARY: _BASE_UNIT {
     .FINAL_TARGET=no
     .ALIASES=SRCS=_SRCS_NO_GLOBAL
     .ALLOWED=EMBED_JAVA_VCS_INFO
-    .RESTRICTED=EXTERNAL_JAR
+    .RESTRICTED=EXTERNAL_JAR 
 
     PEERDIR(build/platform/java/jdk)
     PEERDIR+=$JDK_RESOURCE_PEERDIR
 
     PEERDIR_TAGS=JAVA_PROTO JAVA_FBS JAVA_IDL
-    PROPAGATES_MANAGEABLE_PEERS=yes
-    DYNAMIC_LINK=yes
+    PROPAGATES_MANAGEABLE_PEERS=yes 
+    DYNAMIC_LINK=yes 
     MACRO_ALIAS(PROTO_CMD _JAVA_PROTO_CMD)
     MACRO_ALIAS(EVLOG_CMD _JAVA_EVLOG_CMD)
     MACRO_ALIAS(FBS_CMD _JAVA_FLATC_CMD)
@@ -3438,296 +3438,296 @@ module EXTERNAL_JAVA_LIBRARY: _BASE_UNIT {
 }
 
 # tag:java-specific
-ALL_JAR_SOURCES=
-LINT_JAVA_SOURCES=
-ALL_SRCDIRS=
-LINK_JAR_RESOURCES=
-LINK_JAR_JSOURCES=
-JAR_GEN_SRCS=
-JAR_GEN_JSRCS=
-macro _JAR_SRCS(SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[], FILES[], RESOURCES?"yes":"no", Globs...) {
-    _CHECK_JAVA_SRCDIR($SRCDIR)
-    SET_APPEND(ALL_SRCDIRS $SRCDIR)
-    SET(VAR_SALT $SRCDIR $Globs $EXCLUDE $PACKAGE_PREFIX $RESOURCES $FILES)
-    SET(JAR_SRCS_GLOB uniq_${hash:VAR_SALT})
-    _LATE_GLOB(${JAR_SRCS_GLOB} ${pre=${SRCDIR}/:Globs} EXCLUDE ${EXCLUDE})
-    SET_APPEND(LINT_JAVA_SOURCES \${input;rootrel;ext=.java:${JAR_SRCS_GLOB}})
-    SET_APPEND(ALL_JAR_SOURCES --jsources ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.src.txt --resources ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.res.txt --srcdir ${quo:SRCDIR} \${input:${JAR_SRCS_GLOB}} ${pre=\$\{input\:\";suf=\"\}:FILES})
-    _FILL_JAR_COPY_RESOURCES_CMD(LINK_JAR_RESOURCES ${quo:SRCDIR} ${BINDIR}/cls ${PACKAGE_PREFIX} ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.res.txt)
-    _FILL_JAR_COPY_RESOURCES_CMD(LINK_JAR_JSOURCES ${quo:SRCDIR} ${BINDIR}/src ${PACKAGE_PREFIX} ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.src.txt)
-    _FILL_JAR_GEN_SRCS(JAR_GEN_SRCS  JAR     $SRCDIR ${BINDIR}/cls ${BINDIR}/all-java.srclst ${BINDIR}/misc/all-kt-sources.txt ${BINDIR}/misc/all-gr-sources.txt ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.res.txt $Globs EXCLUDE $EXCLUDE)
-    _FILL_JAR_GEN_SRCS(JAR_GEN_JSRCS SRC_JAR $SRCDIR ${BINDIR}/cls ${BINDIR}/all-java.srclst ${BINDIR}/misc/all-kt-sources.txt ${BINDIR}/misc/all-gr-sources.txt ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.src.txt $Globs EXCLUDE $EXCLUDE)
-}
-
-macro IDEA_JAR_SRCS(Args...) {
-    _JAR_SRCS($Args)
-    SET_APPEND(JAVA_SRCS_VALUE $ARGS_DELIM $Args)
-}
-
-macro _HASH_HELPER(Args...) {
-    .CMD=${hash:Args}
-}
-
-macro _GENTAR_HELPER(OUT_DIR[], Args...) {
-    .CMD=${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/autotar_gendirs.py"} --pack ${OUT_DIR} --outs ${output;tared;suf=.$_HASH_HELPER($Args).gentar:OUT_DIR} ${kv;hide:"tared_kind nodir"}
-}
-
+ALL_JAR_SOURCES= 
+LINT_JAVA_SOURCES= 
+ALL_SRCDIRS= 
+LINK_JAR_RESOURCES= 
+LINK_JAR_JSOURCES= 
+JAR_GEN_SRCS= 
+JAR_GEN_JSRCS= 
+macro _JAR_SRCS(SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[], FILES[], RESOURCES?"yes":"no", Globs...) { 
+    _CHECK_JAVA_SRCDIR($SRCDIR) 
+    SET_APPEND(ALL_SRCDIRS $SRCDIR) 
+    SET(VAR_SALT $SRCDIR $Globs $EXCLUDE $PACKAGE_PREFIX $RESOURCES $FILES) 
+    SET(JAR_SRCS_GLOB uniq_${hash:VAR_SALT}) 
+    _LATE_GLOB(${JAR_SRCS_GLOB} ${pre=${SRCDIR}/:Globs} EXCLUDE ${EXCLUDE}) 
+    SET_APPEND(LINT_JAVA_SOURCES \${input;rootrel;ext=.java:${JAR_SRCS_GLOB}}) 
+    SET_APPEND(ALL_JAR_SOURCES --jsources ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.src.txt --resources ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.res.txt --srcdir ${quo:SRCDIR} \${input:${JAR_SRCS_GLOB}} ${pre=\$\{input\:\";suf=\"\}:FILES}) 
+    _FILL_JAR_COPY_RESOURCES_CMD(LINK_JAR_RESOURCES ${quo:SRCDIR} ${BINDIR}/cls ${PACKAGE_PREFIX} ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.res.txt) 
+    _FILL_JAR_COPY_RESOURCES_CMD(LINK_JAR_JSOURCES ${quo:SRCDIR} ${BINDIR}/src ${PACKAGE_PREFIX} ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.src.txt) 
+    _FILL_JAR_GEN_SRCS(JAR_GEN_SRCS  JAR     $SRCDIR ${BINDIR}/cls ${BINDIR}/all-java.srclst ${BINDIR}/misc/all-kt-sources.txt ${BINDIR}/misc/all-gr-sources.txt ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.res.txt $Globs EXCLUDE $EXCLUDE) 
+    _FILL_JAR_GEN_SRCS(JAR_GEN_JSRCS SRC_JAR $SRCDIR ${BINDIR}/cls ${BINDIR}/all-java.srclst ${BINDIR}/misc/all-kt-sources.txt ${BINDIR}/misc/all-gr-sources.txt ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.src.txt $Globs EXCLUDE $EXCLUDE) 
+} 
+ 
+macro IDEA_JAR_SRCS(Args...) { 
+    _JAR_SRCS($Args) 
+    SET_APPEND(JAVA_SRCS_VALUE $ARGS_DELIM $Args) 
+} 
+ 
+macro _HASH_HELPER(Args...) { 
+    .CMD=${hash:Args} 
+} 
+ 
+macro _GENTAR_HELPER(OUT_DIR[], Args...) { 
+    .CMD=${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/autotar_gendirs.py"} --pack ${OUT_DIR} --outs ${output;tared;suf=.$_HASH_HELPER($Args).gentar:OUT_DIR} ${kv;hide:"tared_kind nodir"} 
+} 
+ 
 # tag:java-specific
-RUN_JAR_PROG_CP_PRE=@
-RUN_JAR_PROG_CP_SUF=.cplst
-when($JDK_VERSION == "8") {
-    RUN_JAR_PROG_CP_PRE=
-    RUN_JAR_PROG_CP_SUF=
-}
-
+RUN_JAR_PROG_CP_PRE=@ 
+RUN_JAR_PROG_CP_SUF=.cplst 
+when($JDK_VERSION == "8") { 
+    RUN_JAR_PROG_CP_PRE= 
+    RUN_JAR_PROG_CP_SUF= 
+} 
+ 
 # tag:java-specific
 macro _DO_2_RUN_JAR_PROGRAM(IN_DIRS_VAR="uniq_", IN_DIRS_INPUTS[], IN{input}[], IN_DIR[], OUT_NOAUTO{output}[], OUT{output}[], TOOL{tool}[], OUT_DIR[], CLASSPATH[], REQUIREMENTS[], ADD_SRCS_TO_CLASSPATH?"yes":"no", CWD="${ARCADIA_BUILD_ROOT}", Args...) {
-    _LATE_GLOB(${IN_DIRS_VAR} ${suf=/**/*:IN_DIR})
-    _CHECK_RUN_JAVA_PROG_CLASSPATH($CLASSPATH)
+    _LATE_GLOB(${IN_DIRS_VAR} ${suf=/**/*:IN_DIR}) 
+    _CHECK_RUN_JAVA_PROG_CLASSPATH($CLASSPATH) 
     .PEERDIR=build/platform/java/jdk $JDK_RESOURCE_PEERDIR
     .CMD=${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/mkdir.py"} ${OUT_DIR} && ${cwd:CWD} $YMAKE_PYTHON ${input:"build/scripts/setup_java_tmpdir.py"} $YMAKE_PYTHON ${input:"build/scripts/stdout2stderr.py"} $YMAKE_PYTHON ${input:"build/scripts/fix_java_command_file_cp.py"} --build-root ${ARCADIA_BUILD_ROOT} $JDK_RESOURCE/bin/java -Dfile.encoding=utf8 -classpath ${RUN_JAR_PROG_CP_PRE}${tool:CLASSPATH}${RUN_JAR_PROG_CP_SUF} ${Args} ${requirements;hide:REQUIREMENTS} ${requirements;hide:"network:restricted"} && $_GENTAR_HELPER($CLASSPATH $IN_DIR $IN $TOOL $Args OUT_DIR $OUT_DIR) ${input;hide:IN} ${output;noauto;hide:OUT_NOAUTO} ${output;hide:OUT} ${tool;hide:TOOL} ${IN_DIRS_INPUTS}
-}
-
+} 
+ 
 # tag:java-specific
-macro _DO_1_RUN_JAR_PROGRAM(IN_DIRS_VAR="uniq", Args...) {
-    _DO_2_RUN_JAR_PROGRAM($Args IN_DIRS_VAR $IN_DIRS_VAR IN_DIRS_INPUTS ${"$"}{input;hide:$IN_DIRS_VAR})
-}
-
+macro _DO_1_RUN_JAR_PROGRAM(IN_DIRS_VAR="uniq", Args...) { 
+    _DO_2_RUN_JAR_PROGRAM($Args IN_DIRS_VAR $IN_DIRS_VAR IN_DIRS_INPUTS ${"$"}{input;hide:$IN_DIRS_VAR}) 
+} 
+ 
 # tag:java-specific
-macro RUN_JAVA_PROGRAM(Args...) {
-    _DO_1_RUN_JAR_PROGRAM($Args IN_DIRS_VAR uniq_${hash:Args})
-}
-
+macro RUN_JAVA_PROGRAM(Args...) { 
+    _DO_1_RUN_JAR_PROGRAM($Args IN_DIRS_VAR uniq_${hash:Args}) 
+} 
+ 
 # tag:java-specific
-_JAR_ANN_PROCESSORS=
-_JAR_ANN_PROC_OPT_PREFIX=
-macro JAR_ANNOTATION_PROCESSOR(Classes...) {
-    SET_APPEND(_JAR_ANN_PROCESSORS $Classes)
-    SET(_JAR_ANN_PROC_OPT_PREFIX -processor)
-
-    # for ya ide idea only
-    SET_APPEND(ANNOTATION_PROCESSOR_VALUE $ARGS_DELIM $Classes)
-}
-
+_JAR_ANN_PROCESSORS= 
+_JAR_ANN_PROC_OPT_PREFIX= 
+macro JAR_ANNOTATION_PROCESSOR(Classes...) { 
+    SET_APPEND(_JAR_ANN_PROCESSORS $Classes) 
+    SET(_JAR_ANN_PROC_OPT_PREFIX -processor) 
+ 
+    # for ya ide idea only 
+    SET_APPEND(ANNOTATION_PROCESSOR_VALUE $ARGS_DELIM $Classes) 
+} 
+ 
 # tag:java-specific
-macro _JAR_ANN_PROC_OPTS(Classes...) {
-    .CMD=$_JAR_ANN_PROC_OPT_PREFIX ${join=,:Classes}
-}
-
+macro _JAR_ANN_PROC_OPTS(Classes...) { 
+    .CMD=$_JAR_ANN_PROC_OPT_PREFIX ${join=,:Classes} 
+} 
+ 
 # tag:java-specific
-macro _NOOP_MACRO(Args...) {
+macro _NOOP_MACRO(Args...) { 
     ENABLE(UNUSED_MACRO)
-}
-
+} 
+ 
 # tag:java-specific
 module _JAR_BASE: _BARE_UNIT {
-    .NODE_TYPE=Bundle
-    .CMD=TOUCH_UNIT
-    .PEERDIR_POLICY=as_build_from
-    .FINAL_TARGET=no
-    .ALIASES=SRCS=_SRCS_NO_GLOBAL
-    .ALLOWED=EMBED_JAVA_VCS_INFO DEPENDENCY_MANAGEMENT EXCLUDE
-
+    .NODE_TYPE=Bundle 
+    .CMD=TOUCH_UNIT 
+    .PEERDIR_POLICY=as_build_from 
+    .FINAL_TARGET=no 
+    .ALIASES=SRCS=_SRCS_NO_GLOBAL 
+    .ALLOWED=EMBED_JAVA_VCS_INFO DEPENDENCY_MANAGEMENT EXCLUDE 
+ 
     PEERDIR_TAGS=JAVA_PROTO JAVA_FBS JAVA_IDL DLL JAR_COMPILATION __EMPTY__
-
-    HAS_MANAGEABLE_PEERS=yes
-    DYNAMIC_LINK=yes
-    MACRO_ALIAS(PROTO_CMD _JAVA_PROTO_CMD)
-    MACRO_ALIAS(EVLOG_CMD _JAVA_EVLOG_CMD)
+ 
+    HAS_MANAGEABLE_PEERS=yes 
+    DYNAMIC_LINK=yes 
+    MACRO_ALIAS(PROTO_CMD _JAVA_PROTO_CMD) 
+    MACRO_ALIAS(EVLOG_CMD _JAVA_EVLOG_CMD) 
     MACRO_ALIAS(FBS_CMD _JAVA_FLATC_CMD)
-
-    DISABLE(NEED_PLATFORM_PEERDIRS)
-    NO_PLATFORM()
-    VCS_JAVA=${suf=.__vcs_version__.mf:TARGET}
+ 
+    DISABLE(NEED_PLATFORM_PEERDIRS) 
+    NO_PLATFORM() 
+    VCS_JAVA=${suf=.__vcs_version__.mf:TARGET} 
     SET(MODULE_LANG JAVA)
-}
-
+} 
+ 
 # tag:java-specific
-module JAVA_CONTRIB_PROXY: _JAR_BASE {
-}
-
+module JAVA_CONTRIB_PROXY: _JAR_BASE { 
+} 
+ 
 # tag:java-specific
-macro _FETCH_CONTRIB(Id, Out, SBR="sbr:") {
-    .CMD=${hide:SANDBOX_FAKEID} ${cwd:BINDIR} ${resource;pre=$SBR:Id} $YMAKE_PYTHON ${input:"build/scripts/fetch_from_sandbox.py"} --resource-file $(RESOURCE_ROOT)/sbr/$Id/resource --resource-id $Id --copy-to ${output:Out} ${input;hide:"build/scripts/fetch_from.py"} ${requirements;hide:"network:full"} ${kv;hide:"p SB"} ${kv;hide:"pc yellow"} ${kv;hide:"show_out"}
-    ADD_CHECK(check.resource $Id)
-}
-
+macro _FETCH_CONTRIB(Id, Out, SBR="sbr:") { 
+    .CMD=${hide:SANDBOX_FAKEID} ${cwd:BINDIR} ${resource;pre=$SBR:Id} $YMAKE_PYTHON ${input:"build/scripts/fetch_from_sandbox.py"} --resource-file $(RESOURCE_ROOT)/sbr/$Id/resource --resource-id $Id --copy-to ${output:Out} ${input;hide:"build/scripts/fetch_from.py"} ${requirements;hide:"network:full"} ${kv;hide:"p SB"} ${kv;hide:"pc yellow"} ${kv;hide:"show_out"} 
+    ADD_CHECK(check.resource $Id) 
+} 
+ 
 # tag:java-specific
-LOCAL_JAR_PATH=
-LOCAL_SOURCES_JAR_PATH=
-JAR_RESOURCE_ID=
-SRC_RESOURCE_ID=
+LOCAL_JAR_PATH= 
+LOCAL_SOURCES_JAR_PATH= 
+JAR_RESOURCE_ID= 
+SRC_RESOURCE_ID= 
 FETCH_SRCS_JAR=
-FETCH_TARGET_JAR=
+FETCH_TARGET_JAR= 
 FETCH_CONTRIB_JAR=$FETCH_TARGET_JAR $FETCH_SRCS_JAR
-
+ 
 # tag:java-specific
-macro JAR_RESOURCE(Id) {
-    SET(JAR_RESOURCE_ID $Id)
-}
-
+macro JAR_RESOURCE(Id) { 
+    SET(JAR_RESOURCE_ID $Id) 
+} 
+ 
 # tag:java-specific
-macro SRC_RESOURCE(Id) {
-    SET(SRC_RESOURCE_ID $Id)
-}
-
+macro SRC_RESOURCE(Id) { 
+    SET(SRC_RESOURCE_ID $Id) 
+} 
+ 
 # tag:java-specific
-macro LOCAL_JAR(File) {
-    SET(LOCAL_JAR_PATH $File)
-}
+macro LOCAL_JAR(File) { 
+    SET(LOCAL_JAR_PATH $File) 
+} 
 
 # tag:java-specific
-macro LOCAL_SOURCES_JAR(File) {
-    SET(LOCAL_SOURCES_JAR_PATH $File)
-}
-
+macro LOCAL_SOURCES_JAR(File) { 
+    SET(LOCAL_SOURCES_JAR_PATH $File) 
+} 
+ 
 # tag:java-specific
-module JAVA_CONTRIB: _JAR_BASE {
-    .CMD=FETCH_CONTRIB_JAR
-    .FINAL_TARGET=yes
-
-    when ($JAR_RESOURCE_ID) {
-        FETCH_TARGET_JAR= && $_FETCH_CONTRIB($JAR_RESOURCE_ID ${BINDIR}/${MODULE_PREFIX}${REALPRJNAME}${MODULE_SUFFIX})
-    }
-    otherwise {
-        when ($LOCAL_JAR_PATH) {
-            FETCH_TARGET_JAR= && $FS_TOOLS copy ${input:LOCAL_JAR_PATH} $TARGET
-        }
-        otherwise {
-            FETCH_TARGET_JAR= && $GENERATE_VCS_JAVA_INFO_NODEP && ${cwd:BINDIR} $JDK_RESOURCE/bin/jar cfvm $TARGET $VCS_JAVA .
-            PEERDIR+=build/platform/java/jdk
+module JAVA_CONTRIB: _JAR_BASE { 
+    .CMD=FETCH_CONTRIB_JAR 
+    .FINAL_TARGET=yes 
+ 
+    when ($JAR_RESOURCE_ID) { 
+        FETCH_TARGET_JAR= && $_FETCH_CONTRIB($JAR_RESOURCE_ID ${BINDIR}/${MODULE_PREFIX}${REALPRJNAME}${MODULE_SUFFIX}) 
+    } 
+    otherwise { 
+        when ($LOCAL_JAR_PATH) { 
+            FETCH_TARGET_JAR= && $FS_TOOLS copy ${input:LOCAL_JAR_PATH} $TARGET 
+        } 
+        otherwise { 
+            FETCH_TARGET_JAR= && $GENERATE_VCS_JAVA_INFO_NODEP && ${cwd:BINDIR} $JDK_RESOURCE/bin/jar cfvm $TARGET $VCS_JAVA . 
+            PEERDIR+=build/platform/java/jdk 
             PEERDIR+=$JDK_RESOURCE_PEERDIR
-        }
-    }
-    when ($SRC_RESOURCE_ID) {
+        } 
+    } 
+    when ($SRC_RESOURCE_ID) { 
         FETCH_SRCS_JAR= && $_FETCH_CONTRIB($SRC_RESOURCE_ID ${BINDIR}/${REALPRJNAME}-sources.jar)
-    }
-    otherwise {
-        when ($LOCAL_SOURCES_JAR_PATH) {
+    } 
+    otherwise { 
+        when ($LOCAL_SOURCES_JAR_PATH) { 
             FETCH_SRCS_JAR= && $FS_TOOLS copy ${input:LOCAL_SOURCES_JAR_PATH} {output;pre=${BINDIR}/;suf=-sources.jar:REALPRJNAME}
-        }
-        otherwise {
+        } 
+        otherwise { 
             FETCH_SRCS_JAR= && $GENERATE_VCS_JAVA_INFO_NODEP && $FS_TOOLS md ${BINDIR}/fake-src && ${cwd;suf=/fake-src:BINDIR} $JDK_RESOURCE/bin/jar cfvm ${output;pre=${BINDIR}/;suf=-sources.jar:REALPRJNAME} $VCS_JAVA .
-            PEERDIR+=build/platform/java/jdk
+            PEERDIR+=build/platform/java/jdk 
             PEERDIR+=$JDK_RESOURCE_PEERDIR
-        }
-    }
-
-    SET(MODULE_SUFFIX .jar)
-}
-
+        } 
+    } 
+ 
+    SET(MODULE_SUFFIX .jar) 
+} 
+ 
 # tag:kotlin-specific
-KOTLINC_OPTS_VALUE=
+KOTLINC_OPTS_VALUE= 
 
 # tag:kotlin-specific
-KT_SRSCLIST_FLAG=--kotlin ${BINDIR}/misc/all-kt-sources.txt
-KT_CLASSES_DIR=${BINDIR}/kt_cls
-COLLECT_KT_CLASSPATH=${YMAKE_PYTHON} ${input:"build/scripts/writer.py"} --file ${BINDIR}/kt_bfg.txt -m --ya-start-command-file ${ext=.jar:MANAGED_PEERS_CLOSURE} --ya-end-command-file
-LINK_KT_CLASSPATH=$YMAKE_PYTHON ${input:"build/scripts/make_java_classpath_file.py"} ${BINDIR}/kt_bfg.txt ${BINDIR}/kt_cp.txt && $FS_TOOLS md $KT_CLASSES_DIR
+KT_SRSCLIST_FLAG=--kotlin ${BINDIR}/misc/all-kt-sources.txt 
+KT_CLASSES_DIR=${BINDIR}/kt_cls 
+COLLECT_KT_CLASSPATH=${YMAKE_PYTHON} ${input:"build/scripts/writer.py"} --file ${BINDIR}/kt_bfg.txt -m --ya-start-command-file ${ext=.jar:MANAGED_PEERS_CLOSURE} --ya-end-command-file 
+LINK_KT_CLASSPATH=$YMAKE_PYTHON ${input:"build/scripts/make_java_classpath_file.py"} ${BINDIR}/kt_bfg.txt ${BINDIR}/kt_cp.txt && $FS_TOOLS md $KT_CLASSES_DIR 
 COMPILE_KT=${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON ${input:"build/scripts/with_pathsep_resolve.py"} $YMAKE_PYTHON ${input:"build/scripts/run_javac.py"} --kotlin --sources-list ${BINDIR}/misc/all-kt-sources.txt $JDK_RESOURCE/bin/java -jar $KOTLIN_COMPILER_RESOURCE_GLOBAL/kotlin-compiler.jar -no-stdlib -module-name $REALPRJNAME -jvm-target ${KOTLIN_JVM_TARGET} @${BINDIR}/misc/all-kt-sources.txt -classpath @${BINDIR}/kt_cp.txt $KOTLINC_FLAGS_VALUE -d $KT_CLASSES_DIR $KOTLINC_OPTS_VALUE
-ALL_KT_COMMANDS=
-KT_CLASSPATH_ITEM=
-
+ALL_KT_COMMANDS= 
+KT_CLASSPATH_ITEM= 
+ 
 # tag:java-specific
-JAVAC_CMD=$JDK_RESOURCE/bin/javac
+JAVAC_CMD=$JDK_RESOURCE/bin/javac 
 ERROR_PRONE_JAVAC_CMD=${YMAKE_PYTHON} ${input:"build/scripts/build_java_with_error_prone2.py"} $JDK_RESOURCE/bin/java $JDK_RESOURCE/bin/javac $ERROR_PRONE_RESOURCE/error_prone.jar
-
+ 
 # tag:java-specific tag:codenav
 JAVA_YNDEXING=no
 
 # tag:java-specific
-when ($USE_SYSTEM_KYTHE) {
-    KYTHE_RESOURCE=$USE_SYSTEM_KYTHE
-}
-otherwise {
-    KYTHE_RESOURCE=$KYTHE_RESOURCE_GLOBAL
-}
+when ($USE_SYSTEM_KYTHE) { 
+    KYTHE_RESOURCE=$USE_SYSTEM_KYTHE 
+} 
+otherwise { 
+    KYTHE_RESOURCE=$KYTHE_RESOURCE_GLOBAL 
+} 
 
 # tag:java-specific tag:codenav
-_JAVA_YNDEXING_CMD=$YMAKE_PYTHON ${input:"build/scripts/build_java_codenav_index.py"} $TARGET $ARCADIA_BUILD_ROOT $ARCADIA_ROOT ${BINDIR}/all-java.srclst $JDK_RESOURCE/bin/java -jar $KYTHE_RESOURCE/kythe/extractors/javac_extractor.jar
-_DO_JAVA_YNDEXING=
-
-# tag:java-specific
-SOURCES_JAR=no
-_PACK_SRC_JAR_IMPL=&& $FS_TOOLS md ${BINDIR}/src $JAR_GEN_JSRCS $LINK_JAR_JSOURCES && ${cwd;suf=/src:BINDIR} $JDK_RESOURCE/bin/jar cfvm ${output;pre=${BINDIR}/${MODULE_PREFIX};suf=-sources.jar:REALPRJNAME} $VCS_JAVA .
-_PACK_SRC_JAR=
-
+_JAVA_YNDEXING_CMD=$YMAKE_PYTHON ${input:"build/scripts/build_java_codenav_index.py"} $TARGET $ARCADIA_BUILD_ROOT $ARCADIA_ROOT ${BINDIR}/all-java.srclst $JDK_RESOURCE/bin/java -jar $KYTHE_RESOURCE/kythe/extractors/javac_extractor.jar 
+_DO_JAVA_YNDEXING= 
+ 
 # tag:java-specific
-_PACK_JNI=
-_PACK_JNI_CMD= && $FS_TOOLS link_or_copy_to_dir --ya-start-command-file ${ext=.so:MANAGED_PEERS_CLOSURE} ${ext=.dll:MANAGED_PEERS_CLOSURE} ${ext=.dylib:MANAGED_PEERS_CLOSURE} --ya-end-command-file ${BINDIR}/cls
-
+SOURCES_JAR=no 
+_PACK_SRC_JAR_IMPL=&& $FS_TOOLS md ${BINDIR}/src $JAR_GEN_JSRCS $LINK_JAR_JSOURCES && ${cwd;suf=/src:BINDIR} $JDK_RESOURCE/bin/jar cfvm ${output;pre=${BINDIR}/${MODULE_PREFIX};suf=-sources.jar:REALPRJNAME} $VCS_JAVA . 
+_PACK_SRC_JAR= 
+ 
 # tag:java-specific
-_MAKE_JSTYLE_FILE_LIST=
-
+_PACK_JNI= 
+_PACK_JNI_CMD= && $FS_TOOLS link_or_copy_to_dir --ya-start-command-file ${ext=.so:MANAGED_PEERS_CLOSURE} ${ext=.dll:MANAGED_PEERS_CLOSURE} ${ext=.dylib:MANAGED_PEERS_CLOSURE} --ya-end-command-file ${BINDIR}/cls 
+ 
 # tag:java-specific
-_LINK_UBERJAR=
-_UBERJAR_SELF=
-_DO_LINK_UBERJAR= && $JDK_RESOURCE/bin/java -cp $UBERJAR_RESOURCE/devtools-java_shader.jar ru.yandex.devtools.emigrante.Main --out-jar $TARGET $_UBERJAR_SELF ${ext=.jar;pre=--jar :MANAGED_PEERS_CLOSURE} ${UBERJAR_PREFIX_FLAG} ${UBERJAR_HIDE_EXCLUDE_FLAGS} $UBERJAR_PATH_EXCLUDES ${UBERJAR_MANIFEST_TRANSFORMER_MAIN_FLAG} ${UBERJAR_MANIFEST_TRANSFORMER_ATTRIBUTE_FLAGS} ${UBERJAR_APPENDING_TRANSFORMER_FLAGS} ${UBERJAR_SERVICES_RESOURCE_TRANSFORMER_FLAG}\
-                  && $YMAKE_PYTHON ${input:"build/scripts/mkdir.py"} $BINDIR/_empty/META-INF \
-                  && $YMAKE_PYTHON ${input:"build/scripts/touch.py"} $BINDIR/_empty/META-INF/MANIFEST.MF \
-                  && $UPDATE_VCS_JAVA_INFO_NODEP($TARGET) \
-                  && ${cwd;suf=/_empty:BINDIR} ${JDK_RESOURCE}/bin/jar ufv ${TARGET} META-INF/MANIFEST.MF \
-                  && $JDK_RESOURCE/bin/jar ufvm $TARGET $VCS_JAVA
-
+_MAKE_JSTYLE_FILE_LIST= 
+ 
 # tag:java-specific
-macro _PACK_JAR_HELPER(Out) {
-    .CMD=${cwd;suf=/cls:BINDIR} $JDK_RESOURCE/bin/jar cfvm $Out $VCS_JAVA .
-}
-
+_LINK_UBERJAR= 
+_UBERJAR_SELF= 
+_DO_LINK_UBERJAR= && $JDK_RESOURCE/bin/java -cp $UBERJAR_RESOURCE/devtools-java_shader.jar ru.yandex.devtools.emigrante.Main --out-jar $TARGET $_UBERJAR_SELF ${ext=.jar;pre=--jar :MANAGED_PEERS_CLOSURE} ${UBERJAR_PREFIX_FLAG} ${UBERJAR_HIDE_EXCLUDE_FLAGS} $UBERJAR_PATH_EXCLUDES ${UBERJAR_MANIFEST_TRANSFORMER_MAIN_FLAG} ${UBERJAR_MANIFEST_TRANSFORMER_ATTRIBUTE_FLAGS} ${UBERJAR_APPENDING_TRANSFORMER_FLAGS} ${UBERJAR_SERVICES_RESOURCE_TRANSFORMER_FLAG}\ 
+                  && $YMAKE_PYTHON ${input:"build/scripts/mkdir.py"} $BINDIR/_empty/META-INF \ 
+                  && $YMAKE_PYTHON ${input:"build/scripts/touch.py"} $BINDIR/_empty/META-INF/MANIFEST.MF \ 
+                  && $UPDATE_VCS_JAVA_INFO_NODEP($TARGET) \ 
+                  && ${cwd;suf=/_empty:BINDIR} ${JDK_RESOURCE}/bin/jar ufv ${TARGET} META-INF/MANIFEST.MF \ 
+                  && $JDK_RESOURCE/bin/jar ufvm $TARGET $VCS_JAVA 
+ 
 # tag:java-specific
-macro _JAVAC_RUN_HELPER(JAVAC_CMD_WITH_ARGS...) {
-    .CMD=${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON ${input:"build/scripts/with_pathsep_resolve.py"} $YMAKE_PYTHON ${input:"build/scripts/setup_java_tmpdir.py"} $YMAKE_PYTHON ${input:"build/scripts/run_javac.py"} --sources-list ${BINDIR}/all-java.srclst ${JAVAC_CMD_WITH_ARGS} @${BINDIR}/all-java.srclst -classpath ${ARCADIA_BUILD_ROOT}/bfg.jar -Xpkginfo:always ${JAVAC_OPTS} $_JAR_ANN_PROC_OPTS($_JAR_ANN_PROCESSORS) -d ${BINDIR}/cls -g -encoding UTF-8
-}
-macro _ADD_HIDDEN_INPUTS(Inputs...) {
-    .CMD=${input;hide:Inputs}
-}
+macro _PACK_JAR_HELPER(Out) { 
+    .CMD=${cwd;suf=/cls:BINDIR} $JDK_RESOURCE/bin/jar cfvm $Out $VCS_JAVA . 
+} 
 
 # tag:java-specific
-ERROR_PRONE_JDK16_ADD_OPENS=-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
-ERROR_PRONE_2_7_1_FORCED_OPTS=-Xep:InlineMeInliner:OFF -Xep:SameNameButDifferent:OFF
-
+macro _JAVAC_RUN_HELPER(JAVAC_CMD_WITH_ARGS...) { 
+    .CMD=${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON ${input:"build/scripts/with_pathsep_resolve.py"} $YMAKE_PYTHON ${input:"build/scripts/setup_java_tmpdir.py"} $YMAKE_PYTHON ${input:"build/scripts/run_javac.py"} --sources-list ${BINDIR}/all-java.srclst ${JAVAC_CMD_WITH_ARGS} @${BINDIR}/all-java.srclst -classpath ${ARCADIA_BUILD_ROOT}/bfg.jar -Xpkginfo:always ${JAVAC_OPTS} $_JAR_ANN_PROC_OPTS($_JAR_ANN_PROCESSORS) -d ${BINDIR}/cls -g -encoding UTF-8 
+} 
+macro _ADD_HIDDEN_INPUTS(Inputs...) { 
+    .CMD=${input;hide:Inputs} 
+} 
+ 
 # tag:java-specific
-JAVA_COVERAGE_SRCLIST_FLAG=--coverage ${output;pre=${MODULE_PREFIX};suf=.cpsf:REALPRJNAME} --source-root ${ARCADIA_ROOT}
-JAVA_COVERAGE_SRCLIST=
-PREPARE_JAVA_BUILD_DIRS=$FS_TOOLS md ${BINDIR}/cls && $FS_TOOLS md ${BINDIR}/misc
-EXTRACT_GENDIRS=${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/autotar_gendirs.py"} --unpack --ext .gentar ${ext=.gentar:AUTO_INPUT}
-COLLECT_JAVA_SRCLIST=${YMAKE_PYTHON} ${input:"build/scripts/make_java_srclists.py"} --moddir ${CURDIR} --java ${BINDIR}/all-java.srclst ${KT_SRSCLIST} ${JAVA_COVERAGE_SRCLIST} --ya-start-command-file ${ALL_JAR_SOURCES} ${ext=.java:AUTO_INPUT} ${ext=.kt:AUTO_INPUT} --ya-end-command-file
-COLLECT_CLASSPATH=${YMAKE_PYTHON} ${input:"build/scripts/writer.py"} --file ${BINDIR}/bfg.txt -m --ya-start-command-file ${rootrel:MANAGED_PEERS_CLOSURE} $KT_CLASSPATH_ITEM --ya-end-command-file
-LINK_CLASSPATH=${YMAKE_PYTHON} ${input:"build/scripts/make_manifest_from_bf.py"} ${BINDIR}/bfg.txt ${ARCADIA_BUILD_ROOT}/bfg.jar
-COMPILE_JAVA_SRCLIST=$_JAVAC_RUN_HELPER($JAVAC_CMD)
-PACK_JAR=$_PACK_JAR_HELPER($TARGET)
-# NOTE: No && before LINK_JAR_RESOURCES, ALL_KT_COMMANDS and JAR_GEN_SRCS needed since those vars either empty or starts with &&
-LINK_JAR=$PREPARE_JAVA_BUILD_DIRS \
-      && $EXTRACT_GENDIRS \
-      && $COLLECT_JAVA_SRCLIST \
-         $JAR_GEN_SRCS \
-         $ALL_KT_COMMANDS \
-      && $COLLECT_CLASSPATH \
-      && $LINK_CLASSPATH \
-      && $COMPILE_JAVA_SRCLIST \
-         $LINK_JAR_RESOURCES \
-      && ${cwd;suf=/cls:BINDIR} $GENERATE_VCS_JAVA_INFO_NODEP . \
-         $_PACK_SRC_JAR \
-         $_PACK_JNI \
-      && $PACK_JAR \
-         $_DO_JAVA_YNDEXING \
+ERROR_PRONE_JDK16_ADD_OPENS=-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED 
+ERROR_PRONE_2_7_1_FORCED_OPTS=-Xep:InlineMeInliner:OFF -Xep:SameNameButDifferent:OFF 
+ 
+# tag:java-specific 
+JAVA_COVERAGE_SRCLIST_FLAG=--coverage ${output;pre=${MODULE_PREFIX};suf=.cpsf:REALPRJNAME} --source-root ${ARCADIA_ROOT} 
+JAVA_COVERAGE_SRCLIST= 
+PREPARE_JAVA_BUILD_DIRS=$FS_TOOLS md ${BINDIR}/cls && $FS_TOOLS md ${BINDIR}/misc 
+EXTRACT_GENDIRS=${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/autotar_gendirs.py"} --unpack --ext .gentar ${ext=.gentar:AUTO_INPUT} 
+COLLECT_JAVA_SRCLIST=${YMAKE_PYTHON} ${input:"build/scripts/make_java_srclists.py"} --moddir ${CURDIR} --java ${BINDIR}/all-java.srclst ${KT_SRSCLIST} ${JAVA_COVERAGE_SRCLIST} --ya-start-command-file ${ALL_JAR_SOURCES} ${ext=.java:AUTO_INPUT} ${ext=.kt:AUTO_INPUT} --ya-end-command-file 
+COLLECT_CLASSPATH=${YMAKE_PYTHON} ${input:"build/scripts/writer.py"} --file ${BINDIR}/bfg.txt -m --ya-start-command-file ${rootrel:MANAGED_PEERS_CLOSURE} $KT_CLASSPATH_ITEM --ya-end-command-file 
+LINK_CLASSPATH=${YMAKE_PYTHON} ${input:"build/scripts/make_manifest_from_bf.py"} ${BINDIR}/bfg.txt ${ARCADIA_BUILD_ROOT}/bfg.jar 
+COMPILE_JAVA_SRCLIST=$_JAVAC_RUN_HELPER($JAVAC_CMD) 
+PACK_JAR=$_PACK_JAR_HELPER($TARGET) 
+# NOTE: No && before LINK_JAR_RESOURCES, ALL_KT_COMMANDS and JAR_GEN_SRCS needed since those vars either empty or starts with && 
+LINK_JAR=$PREPARE_JAVA_BUILD_DIRS \ 
+      && $EXTRACT_GENDIRS \ 
+      && $COLLECT_JAVA_SRCLIST \ 
+         $JAR_GEN_SRCS \ 
+         $ALL_KT_COMMANDS \ 
+      && $COLLECT_CLASSPATH \ 
+      && $LINK_CLASSPATH \ 
+      && $COMPILE_JAVA_SRCLIST \ 
+         $LINK_JAR_RESOURCES \ 
+      && ${cwd;suf=/cls:BINDIR} $GENERATE_VCS_JAVA_INFO_NODEP . \ 
+         $_PACK_SRC_JAR \ 
+         $_PACK_JNI \ 
+      && $PACK_JAR \ 
+         $_DO_JAVA_YNDEXING \ 
          ${requirements;hide:JAVA_REQUIREMENTS} \
-         ${kv;hide:"p JV"} ${kv;hide:"pc light-blue"} ${kv;hide:"show_out"} \
-         $_MAKE_JSTYLE_FILE_LIST \
-         $_LINK_UBERJAR \
-         $_ADD_HIDDEN_INPUTS($JAVA_EXTERNAL_DEPENDENCIES_VALUE)
-
+         ${kv;hide:"p JV"} ${kv;hide:"pc light-blue"} ${kv;hide:"show_out"} \ 
+         $_MAKE_JSTYLE_FILE_LIST \ 
+         $_LINK_UBERJAR \ 
+         $_ADD_HIDDEN_INPUTS($JAVA_EXTERNAL_DEPENDENCIES_VALUE) 
+ 
 # tag:java-specific
-_EXT_SRC_JAR=
-_EXT_JAR=
-_COPY_EXT_SRC_JAR=
-_DO_USE_EXT_JAR=$FS_TOOLS copy ${input:_EXT_JAR} $TARGET $_COPY_EXT_SRC_JAR
-_DO_COPY_EXT_SRC_JAR= && $FS_TOOLS copy $_EXT_SRC_JAR ${output;pre=${BINDIR}/${MODULE_PREFIX};suf=-sources.jar:REALPRJNAME}
-macro JAVA_RESOURCE(JAR, SOURCES="") {
-    SET(_EXT_SRC_JAR $SOURCES)
-    SET(_EXT_JAR $JAR)
-}
-
+_EXT_SRC_JAR= 
+_EXT_JAR= 
+_COPY_EXT_SRC_JAR= 
+_DO_USE_EXT_JAR=$FS_TOOLS copy ${input:_EXT_JAR} $TARGET $_COPY_EXT_SRC_JAR 
+_DO_COPY_EXT_SRC_JAR= && $FS_TOOLS copy $_EXT_SRC_JAR ${output;pre=${BINDIR}/${MODULE_PREFIX};suf=-sources.jar:REALPRJNAME} 
+macro JAVA_RESOURCE(JAR, SOURCES="") { 
+    SET(_EXT_SRC_JAR $SOURCES) 
+    SET(_EXT_JAR $JAR) 
+} 
+ 
 # tag:java-specific tag:fbs
 JAVA_FLATBUFFERS_VERSION = 2.0.0
 
@@ -3751,271 +3751,271 @@ module _COMPILABLE_JAR_BASE : _JAR_BASE {
 }
 
 # tag:java-specific tag:internal
-### @usage: JAR_LIBRARY() #internal
-###
-### Reimplementation of the JAVA_LIBRARY with ymake.core.conf and ymake based dependency management
+### @usage: JAR_LIBRARY() #internal 
+### 
+### Reimplementation of the JAVA_LIBRARY with ymake.core.conf and ymake based dependency management 
 module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
-    .EXTS=.jsrc .java .jar .mf .gentar .kt
-    .CMD=LINK_JAR
-    .FINAL_TARGET=yes
-    .ALIASES=JAVA_SRCS=IDEA_JAR_SRCS ANNOTATION_PROCESSOR=JAR_ANNOTATION_PROCESSOR
-    .RESTRICTED=EXTERNAL_JAR
-    MODULE_SUFFIX=.jar
-
-    PEERDIR(build/platform/java/jdk)
+    .EXTS=.jsrc .java .jar .mf .gentar .kt 
+    .CMD=LINK_JAR 
+    .FINAL_TARGET=yes 
+    .ALIASES=JAVA_SRCS=IDEA_JAR_SRCS ANNOTATION_PROCESSOR=JAR_ANNOTATION_PROCESSOR 
+    .RESTRICTED=EXTERNAL_JAR 
+    MODULE_SUFFIX=.jar 
+ 
+    PEERDIR(build/platform/java/jdk) 
     PEERDIR+=$JDK_RESOURCE_PEERDIR
-
-    when ($_EXT_SRC_JAR) {
-        _COPY_EXT_SRC_JAR=_DO_COPY_EXT_SRC_JAR
-    }
-    when ($_EXT_JAR) {
-        LINK_JAR=$_DO_USE_EXT_JAR
-    }
-
-    # in the ideal world this statement must be under condition bellow
-    DEPENDENCY_MANAGEMENT(contrib/java/org/jetbrains/kotlin/kotlin-stdlib-jdk8/${KOTLIN_VERSION})
-    when ($WITH_KOTLIN_VALUE) {
-        KT_SRSCLIST=$KT_SRSCLIST_FLAG
-        ALL_KT_COMMANDS=&& $COLLECT_KT_CLASSPATH && $LINK_KT_CLASSPATH && $COMPILE_KT
-        LINK_JAR_RESOURCES+=&& $FS_TOOLS copy_all_files ${KT_CLASSES_DIR} ${BINDIR}/cls
-        PEERDIR+=build/platform/java/kotlin contrib/java/org/jetbrains/kotlin/kotlin-stdlib-jdk8
-        when($WITH_KOTLINC_PLUGIN_ALLOPEN) {
-            KOTLINC_OPTS_VALUE+=-Xplugin=${KOTLIN_COMPILER_RESOURCE_GLOBAL}/plugins/kotlin-allopen-plugin.jar
-        }
+ 
+    when ($_EXT_SRC_JAR) { 
+        _COPY_EXT_SRC_JAR=_DO_COPY_EXT_SRC_JAR 
+    } 
+    when ($_EXT_JAR) { 
+        LINK_JAR=$_DO_USE_EXT_JAR 
+    } 
+ 
+    # in the ideal world this statement must be under condition bellow 
+    DEPENDENCY_MANAGEMENT(contrib/java/org/jetbrains/kotlin/kotlin-stdlib-jdk8/${KOTLIN_VERSION}) 
+    when ($WITH_KOTLIN_VALUE) { 
+        KT_SRSCLIST=$KT_SRSCLIST_FLAG 
+        ALL_KT_COMMANDS=&& $COLLECT_KT_CLASSPATH && $LINK_KT_CLASSPATH && $COMPILE_KT 
+        LINK_JAR_RESOURCES+=&& $FS_TOOLS copy_all_files ${KT_CLASSES_DIR} ${BINDIR}/cls 
+        PEERDIR+=build/platform/java/kotlin contrib/java/org/jetbrains/kotlin/kotlin-stdlib-jdk8 
+        when($WITH_KOTLINC_PLUGIN_ALLOPEN) { 
+            KOTLINC_OPTS_VALUE+=-Xplugin=${KOTLIN_COMPILER_RESOURCE_GLOBAL}/plugins/kotlin-allopen-plugin.jar 
+        } 
         when($WITH_KOTLINC_PLUGIN_NOARG) {
             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
-        # here assumes that jar file with classpath for javac located in the $ARCADIA_BUILD_ROOT
-        KT_CLASSPATH_ITEM=$MODDIR/kt_cls
-    }
-    otherwise {
-        KT_SRSCLIST=
-        ALL_KT_COMMANDS=
-        KT_CLASSES=
-    }
-
-    when ($SOURCES_JAR == "yes") {
-        _PACK_SRC_JAR=$_PACK_SRC_JAR_IMPL
-    }
-
-    when ($JAVA_COVERAGE == "yes") {
-        JAVA_COVERAGE_SRCLIST=$JAVA_COVERAGE_SRCLIST_FLAG
-    }
-
-    when ($MAKE_UBERJAR_VALUE == "yes") {
-        _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.
-        when($ALL_JAR_SOURCES) {
-            _UBERJAR_SELF=--jar ${BINDIR}/${REALPRJNAME}.lib.jar
-        }
-        PEERDIR+=build/platform/java/uberjar
+        # 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 
+        # here assumes that jar file with classpath for javac located in the $ARCADIA_BUILD_ROOT 
+        KT_CLASSPATH_ITEM=$MODDIR/kt_cls 
+    } 
+    otherwise { 
+        KT_SRSCLIST= 
+        ALL_KT_COMMANDS= 
+        KT_CLASSES= 
+    } 
+ 
+    when ($SOURCES_JAR == "yes") { 
+        _PACK_SRC_JAR=$_PACK_SRC_JAR_IMPL 
+    } 
+ 
+    when ($JAVA_COVERAGE == "yes") { 
+        JAVA_COVERAGE_SRCLIST=$JAVA_COVERAGE_SRCLIST_FLAG 
+    } 
+ 
+    when ($MAKE_UBERJAR_VALUE == "yes") { 
+        _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. 
+        when($ALL_JAR_SOURCES) { 
+            _UBERJAR_SELF=--jar ${BINDIR}/${REALPRJNAME}.lib.jar 
+        } 
+        PEERDIR+=build/platform/java/uberjar 
         PEERDIR+=$UBERJAR_RESOURCE_PEERDIR
-    }
-
-    when($JAVA_YNDEXING == "yes") {
-        PEERDIR+=build/platform/java/kythe
-        _DO_JAVA_YNDEXING=&& $_JAVAC_RUN_HELPER($_JAVA_YNDEXING_CMD) && ${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/find_and_tar.py"} kindex.tar .kzip ${output;hide;tared:"kindex.tar"}
-    }
-
-    when($ERROR_PRONE_VALUE) {
+    } 
+ 
+    when($JAVA_YNDEXING == "yes") { 
+        PEERDIR+=build/platform/java/kythe 
+        _DO_JAVA_YNDEXING=&& $_JAVAC_RUN_HELPER($_JAVA_YNDEXING_CMD) && ${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/find_and_tar.py"} kindex.tar .kzip ${output;hide;tared:"kindex.tar"} 
+    } 
+ 
+    when($ERROR_PRONE_VALUE) { 
         PEERDIR+=$ERROR_PRONE_PEERDIR
-        JAVAC_CMD=$ERROR_PRONE_JAVAC_CMD
-    }
-
-    when($ERROR_PRONE_VALUE && $JDK_VERSION == "16") {
-        JAVAC_FLAGS_VALUE+=$ERROR_PRONE_JDK16_ADD_OPENS
-        JAVAC_OPTS+=$ERROR_PRONE_JDK16_ADD_OPENS
-    }
-
+        JAVAC_CMD=$ERROR_PRONE_JAVAC_CMD 
+    } 
+ 
+    when($ERROR_PRONE_VALUE && $JDK_VERSION == "16") { 
+        JAVAC_FLAGS_VALUE+=$ERROR_PRONE_JDK16_ADD_OPENS 
+        JAVAC_OPTS+=$ERROR_PRONE_JDK16_ADD_OPENS 
+    } 
+ 
     when($ERROR_PRONE_VALUE && $JDK_VERSION == "17") {
         JAVAC_FLAGS_VALUE+=$ERROR_PRONE_JDK16_ADD_OPENS
         JAVAC_OPTS+=$ERROR_PRONE_JDK16_ADD_OPENS
     }
 
-    when($ERROR_PRONE_VALUE && $ERROR_PRONE_VERSION == "2.7.1") {
-        JAVAC_FLAGS_VALUE+=$ERROR_PRONE_2_7_1_FORCED_OPTS
-        JAVAC_OPTS+=$ERROR_PRONE_2_7_1_FORCED_OPTS
-    }
-
-    when ($JAVA_ADD_DLLS_VALUE == "yes") {
-        CONSUME_NON_MANAGEABLE_PEERS=yes
-        _PACK_JNI=$_PACK_JNI_CMD
-    }
-
-    when ($LINT_LEVEL_VALUE != "none") {
-        _MAKE_JSTYLE_FILE_LIST= && $YMAKE_PYTHON ${input:"build/scripts/writer.py"} --file ${output;noauto:"lint-java.srclst"} -m --ya-start-command-file $LINT_JAVA_SOURCES --ya-end-command-file
-    }
-
-    SET(MODULE_TYPE JAVA_LIBRARY)
-    ENABLE(YMAKE_JAVA_TEST)
-    _ADD_JAVA_STYLE_CHECKS($(BUILD_ROOT)/$MODDIR/lint-java.srclst::$(SOURCE_ROOT))
-    _ADD_CLASSPATH_CLASH_CHECK()
-    JAVA_MODULE(IDEA_ONLY)
-}
-
+    when($ERROR_PRONE_VALUE && $ERROR_PRONE_VERSION == "2.7.1") { 
+        JAVAC_FLAGS_VALUE+=$ERROR_PRONE_2_7_1_FORCED_OPTS 
+        JAVAC_OPTS+=$ERROR_PRONE_2_7_1_FORCED_OPTS 
+    } 
+ 
+    when ($JAVA_ADD_DLLS_VALUE == "yes") { 
+        CONSUME_NON_MANAGEABLE_PEERS=yes 
+        _PACK_JNI=$_PACK_JNI_CMD 
+    } 
+ 
+    when ($LINT_LEVEL_VALUE != "none") { 
+        _MAKE_JSTYLE_FILE_LIST= && $YMAKE_PYTHON ${input:"build/scripts/writer.py"} --file ${output;noauto:"lint-java.srclst"} -m --ya-start-command-file $LINT_JAVA_SOURCES --ya-end-command-file 
+    } 
+ 
+    SET(MODULE_TYPE JAVA_LIBRARY) 
+    ENABLE(YMAKE_JAVA_TEST) 
+    _ADD_JAVA_STYLE_CHECKS($(BUILD_ROOT)/$MODDIR/lint-java.srclst::$(SOURCE_ROOT)) 
+    _ADD_CLASSPATH_CLASH_CHECK() 
+    JAVA_MODULE(IDEA_ONLY) 
+} 
+ 
 # tag:java-specific
-_SCRIPTGEN_FLAGS=
-macro _GEN_JAVA_SCRIPT_IMPL(Out, Template, Props...) {
-    .CMD=$SCRIPTGEN_RESOURCE_GLOBAL/scriptgen --java $JDK_RESOURCE/bin/java --output ${output:Out} --template ${input:Template} ${_SCRIPTGEN_FLAGS} -D JAR_NAME=${REALPRJNAME}.jar -D CLASSPATH=${nopath;join;ext=.jar;pre="::":MANAGED_PEERS_CLOSURE} -D PROJECT_DIR=${MODDIR} -D JAR_BASENAME=${REALPRJNAME} $Props
-}
-
+_SCRIPTGEN_FLAGS= 
+macro _GEN_JAVA_SCRIPT_IMPL(Out, Template, Props...) { 
+    .CMD=$SCRIPTGEN_RESOURCE_GLOBAL/scriptgen --java $JDK_RESOURCE/bin/java --output ${output:Out} --template ${input:Template} ${_SCRIPTGEN_FLAGS} -D JAR_NAME=${REALPRJNAME}.jar -D CLASSPATH=${nopath;join;ext=.jar;pre="::":MANAGED_PEERS_CLOSURE} -D PROJECT_DIR=${MODDIR} -D JAR_BASENAME=${REALPRJNAME} $Props 
+} 
+ 
 # tag:java-specific
-_GEN_USERSCRIPTS=
-macro _ADD_GEN_JAVA_SCRIPT(Out, Template, Props...) {
-    SET_APPEND(_GEN_USERSCRIPTS && \$_GEN_JAVA_SCRIPT_IMPL($Out $Template $Props))
-}
-
+_GEN_USERSCRIPTS= 
+macro _ADD_GEN_JAVA_SCRIPT(Out, Template, Props...) { 
+    SET_APPEND(_GEN_USERSCRIPTS && \$_GEN_JAVA_SCRIPT_IMPL($Out $Template $Props)) 
+} 
+ 
 # tag:java-specific
-_PACK_JDK=
-
+_PACK_JDK= 
+ 
 # tag:java-specific
-DO_GEN_JAVA_RUN_SH=
-_SOURCE_JARS=
-_SOURCE_JARS_CPLIST=
-GEN_JAVA_RUN_SH=$SCRIPTGEN_RESOURCE_GLOBAL/scriptgen --java $JDK_RESOURCE/bin/java --output ${output:"run.sh"} -D GENERATE_DEFAULT_RUNNER=yes -D JAR_NAME=${REALPRJNAME}.jar -D CLASSPATH=${nopath;join;pre="::":MANAGED_PEERS_CLOSURE} -D PROJECT_DIR=${REALPRJNAME}
-GEN_RUN_CP=${YMAKE_PYTHON} ${input:"build/scripts/writer.py"} --file ${BINDIR}/run-bf.txt -Q -m --ya-start-command-file ${nopath;qe;pre=$REALPRJNAME/:MANAGED_PEERS_CLOSURE} --ya-end-command-file && ${YMAKE_PYTHON} ${input:"build/scripts/make_manifest_from_bf.py"} ${BINDIR}/run-bf.txt ${TARGET}
-COLLECT_JAR_PROGRAM_CP=$FS_TOOLS link_or_copy_to_dir --ya-start-command-file ${ext=.jar:MANAGED_PEERS_CLOSURE} ${ext=.so:MANAGED_PEERS_CLOSURE} ${ext=.dll:MANAGED_PEERS_CLOSURE} ${ext=.dylib:MANAGED_PEERS_CLOSURE} ${_SOURCE_JARS} --ya-end-command-file ${BINDIR}/${REALPRJNAME} ${hide;late_out;nopath;ext=.jar;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} ${hide;late_out;nopath;ext=.so;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} ${hide;late_out;nopath;ext=.dll;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} ${hide;late_out;nopath;ext=.dylib;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE}
-MAKE_JAR_PROGRAM_CPLST=$YMAKE_PYTHON ${input:"build/scripts/make_java_classpath_file.py"} --from-args ${output;pre=$MODULE_PREFIX;suf=${MODULE_SUFFIX}.cplst:REALPRJNAME} --ya-start-command-file ${nopath;rootrel;ext=.jar;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} ${_SOURCE_JARS_CPLIST} --ya-end-command-file
-TAR_CLASSPATH= && $YMAKE_PYTHON ${input:"build/scripts/find_and_tar.py"} ${output;pre=$MODULE_PREFIX;suf=.tar:REALPRJNAME} ${cwd;pre=$BINDIR/:REALPRJNAME}
-DO_TAR_CLASSPATH=
-LINK_JAR_PROGRAM=$FS_TOOLS md ${BINDIR}/${REALPRJNAME} && $COLLECT_JAR_PROGRAM_CP && $DO_GEN_JAVA_RUN_SH && $GEN_RUN_CP && $MAKE_JAR_PROGRAM_CPLST $DO_TAR_CLASSPATH $_GEN_USERSCRIPTS $_PACK_JDK ${kv;hide:"p JP"} ${kv;hide:"pc light-blue"} ${kv;hide:"show_out"}
-
+DO_GEN_JAVA_RUN_SH= 
+_SOURCE_JARS= 
+_SOURCE_JARS_CPLIST= 
+GEN_JAVA_RUN_SH=$SCRIPTGEN_RESOURCE_GLOBAL/scriptgen --java $JDK_RESOURCE/bin/java --output ${output:"run.sh"} -D GENERATE_DEFAULT_RUNNER=yes -D JAR_NAME=${REALPRJNAME}.jar -D CLASSPATH=${nopath;join;pre="::":MANAGED_PEERS_CLOSURE} -D PROJECT_DIR=${REALPRJNAME} 
+GEN_RUN_CP=${YMAKE_PYTHON} ${input:"build/scripts/writer.py"} --file ${BINDIR}/run-bf.txt -Q -m --ya-start-command-file ${nopath;qe;pre=$REALPRJNAME/:MANAGED_PEERS_CLOSURE} --ya-end-command-file && ${YMAKE_PYTHON} ${input:"build/scripts/make_manifest_from_bf.py"} ${BINDIR}/run-bf.txt ${TARGET} 
+COLLECT_JAR_PROGRAM_CP=$FS_TOOLS link_or_copy_to_dir --ya-start-command-file ${ext=.jar:MANAGED_PEERS_CLOSURE} ${ext=.so:MANAGED_PEERS_CLOSURE} ${ext=.dll:MANAGED_PEERS_CLOSURE} ${ext=.dylib:MANAGED_PEERS_CLOSURE} ${_SOURCE_JARS} --ya-end-command-file ${BINDIR}/${REALPRJNAME} ${hide;late_out;nopath;ext=.jar;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} ${hide;late_out;nopath;ext=.so;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} ${hide;late_out;nopath;ext=.dll;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} ${hide;late_out;nopath;ext=.dylib;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} 
+MAKE_JAR_PROGRAM_CPLST=$YMAKE_PYTHON ${input:"build/scripts/make_java_classpath_file.py"} --from-args ${output;pre=$MODULE_PREFIX;suf=${MODULE_SUFFIX}.cplst:REALPRJNAME} --ya-start-command-file ${nopath;rootrel;ext=.jar;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} ${_SOURCE_JARS_CPLIST} --ya-end-command-file 
+TAR_CLASSPATH= && $YMAKE_PYTHON ${input:"build/scripts/find_and_tar.py"} ${output;pre=$MODULE_PREFIX;suf=.tar:REALPRJNAME} ${cwd;pre=$BINDIR/:REALPRJNAME} 
+DO_TAR_CLASSPATH= 
+LINK_JAR_PROGRAM=$FS_TOOLS md ${BINDIR}/${REALPRJNAME} && $COLLECT_JAR_PROGRAM_CP && $DO_GEN_JAVA_RUN_SH && $GEN_RUN_CP && $MAKE_JAR_PROGRAM_CPLST $DO_TAR_CLASSPATH $_GEN_USERSCRIPTS $_PACK_JDK ${kv;hide:"p JP"} ${kv;hide:"pc light-blue"} ${kv;hide:"show_out"} 
+ 
 # tag:java-specific
-# UBERJAR program link command
-LINK_UBERJAR_PROGRAM=$YMAKE_PYTHON ${input:"build/scripts/make_java_classpath_file.py"} --from-args ${output;pre=$MODULE_PREFIX;suf=${MODULE_SUFFIX}.cplst:REALPRJNAME} $TARGET \
-                     && $FS_TOOLS md ${BINDIR}/${REALPRJNAME} \
-                     && $FS_TOOLS link_or_copy ${BINDIR}/${REALPRJNAME}.jar $TARGET \
-                     && $FS_TOOLS link_or_copy_to_dir --ya-start-command-file ${BINDIR}/${REALPRJNAME}.jar ${ext=.so:MANAGED_PEERS_CLOSURE} ${ext=.dll:MANAGED_PEERS_CLOSURE} ${ext=.dylib:MANAGED_PEERS_CLOSURE} ${_SOURCE_JARS} --ya-end-command-file ${BINDIR}/${REALPRJNAME} ${hide;late_out;ext=.jar;pre=$BINDIR/$REALPRJNAME/:REALPRJNAME} ${hide;late_out;nopath;ext=.so;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} ${hide;late_out;nopath;ext=.dll;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} ${hide;late_out;nopath;ext=.dylib;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} \
-                     $DO_TAR_CLASSPATH \
-                     $_GEN_USERSCRIPTS \
-                     $_PACK_JDK
-
+# UBERJAR program link command 
+LINK_UBERJAR_PROGRAM=$YMAKE_PYTHON ${input:"build/scripts/make_java_classpath_file.py"} --from-args ${output;pre=$MODULE_PREFIX;suf=${MODULE_SUFFIX}.cplst:REALPRJNAME} $TARGET \ 
+                     && $FS_TOOLS md ${BINDIR}/${REALPRJNAME} \ 
+                     && $FS_TOOLS link_or_copy ${BINDIR}/${REALPRJNAME}.jar $TARGET \ 
+                     && $FS_TOOLS link_or_copy_to_dir --ya-start-command-file ${BINDIR}/${REALPRJNAME}.jar ${ext=.so:MANAGED_PEERS_CLOSURE} ${ext=.dll:MANAGED_PEERS_CLOSURE} ${ext=.dylib:MANAGED_PEERS_CLOSURE} ${_SOURCE_JARS} --ya-end-command-file ${BINDIR}/${REALPRJNAME} ${hide;late_out;ext=.jar;pre=$BINDIR/$REALPRJNAME/:REALPRJNAME} ${hide;late_out;nopath;ext=.so;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} ${hide;late_out;nopath;ext=.dll;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} ${hide;late_out;nopath;ext=.dylib;pre=$BINDIR/$REALPRJNAME/:MANAGED_PEERS_CLOSURE} \ 
+                     $DO_TAR_CLASSPATH \ 
+                     $_GEN_USERSCRIPTS \ 
+                     $_PACK_JDK 
+ 
 # 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
-_JAR_SRCS_CALLED=no
-
+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 
+_JAR_SRCS_CALLED=no 
+ 
 # tag:java-specific
-macro _MARK_JAVA_PROG_WITH_SOURCES(Args...) {
-    ENABLE(_JAR_SRCS_CALLED)
-}
-
+macro _MARK_JAVA_PROG_WITH_SOURCES(Args...) { 
+    ENABLE(_JAR_SRCS_CALLED) 
+} 
+ 
 # tag:java-specific
 module _JAR_RUNABLE: _COMPILABLE_JAR_BASE {
-    .FINAL_TARGET=yes
-    .CMD=LINK_JAR_PROGRAM
-    .ALIASES=JAVA_SRCS=_MARK_JAVA_PROG_WITH_SOURCES GENERATE_SCRIPT=_YMAKE_GENERATE_SCRIPT
-    MODULE_SUFFIX=.run.cp.jar
-    CONSUME_NON_MANAGEABLE_PEERS=yes
-
-    when ($RUN_WITH_SOURCES == "yes") {
-        _SOURCE_JARS=${ext=.jar;noext;suf=-sources.jar:MANAGED_PEERS_CLOSURE} ${hide;late_out;ext=.jar;nopath;pre=$BINDIR/$REALPRJNAME/;noext;suf=-sources.jar:MANAGED_PEERS_CLOSURE}
-        _SOURCE_JARS_CPLIST=${nopath;rootrel;ext=.jar;pre=$BINDIR/$REALPRJNAME/;noext;suf=-sources.jar:MANAGED_PEERS_CLOSURE}
-    }
-
-    when ($_JAR_SRCS_CALLED && $TARED_CLASSPATH) {
-        DO_TAR_CLASSPATH=$TAR_CLASSPATH
-    }
-
-    when ($DISABLE_SCRIPTGEN) {
-        DO_GEN_JAVA_RUN_SH=
-    }
-    otherwise {
-        DO_GEN_JAVA_RUN_SH=$GEN_JAVA_RUN_SH
-        PEERDIR+=build/platform/java/scriptgen
-    }
-
-    when ($WITH_JDK_VALUE) {
+    .FINAL_TARGET=yes 
+    .CMD=LINK_JAR_PROGRAM 
+    .ALIASES=JAVA_SRCS=_MARK_JAVA_PROG_WITH_SOURCES GENERATE_SCRIPT=_YMAKE_GENERATE_SCRIPT 
+    MODULE_SUFFIX=.run.cp.jar 
+    CONSUME_NON_MANAGEABLE_PEERS=yes 
+ 
+    when ($RUN_WITH_SOURCES == "yes") { 
+        _SOURCE_JARS=${ext=.jar;noext;suf=-sources.jar:MANAGED_PEERS_CLOSURE} ${hide;late_out;ext=.jar;nopath;pre=$BINDIR/$REALPRJNAME/;noext;suf=-sources.jar:MANAGED_PEERS_CLOSURE} 
+        _SOURCE_JARS_CPLIST=${nopath;rootrel;ext=.jar;pre=$BINDIR/$REALPRJNAME/;noext;suf=-sources.jar:MANAGED_PEERS_CLOSURE} 
+    } 
+ 
+    when ($_JAR_SRCS_CALLED && $TARED_CLASSPATH) { 
+        DO_TAR_CLASSPATH=$TAR_CLASSPATH 
+    } 
+ 
+    when ($DISABLE_SCRIPTGEN) { 
+        DO_GEN_JAVA_RUN_SH= 
+    } 
+    otherwise { 
+        DO_GEN_JAVA_RUN_SH=$GEN_JAVA_RUN_SH 
+        PEERDIR+=build/platform/java/scriptgen 
+    } 
+ 
+    when ($WITH_JDK_VALUE) { 
         _PACK_JDK= && ${YMAKE_PYTHON} ${input:"build/scripts/tar_directory.py"} ${output;tared:"jdk.tar"} $WITH_JDK_RESOURCE $WITH_JDK_RESOURCE
-    }
-
-    when ($MAKE_UBERJAR_VALUE == "yes") {
-        LINK_JAR_PROGRAM=$LINK_UBERJAR_PROGRAM
-        DYNAMIC_LINK=no
-        _SCRIPTGEN_FLAGS=-D IS_UBERJAR=yes
-    }
-    otherwise {
-        _SCRIPTGEN_FLAGS=-D IS_UBERJAR=no
-    }
+    } 
+ 
+    when ($MAKE_UBERJAR_VALUE == "yes") { 
+        LINK_JAR_PROGRAM=$LINK_UBERJAR_PROGRAM 
+        DYNAMIC_LINK=no 
+        _SCRIPTGEN_FLAGS=-D IS_UBERJAR=yes 
+    } 
+    otherwise { 
+        _SCRIPTGEN_FLAGS=-D IS_UBERJAR=no 
+    } 
     CHECK_PROVIDES()
-}
-
+} 
+ 
 # tag:java-specific
-multimodule JAR_PROGRAM {
-    module JAR_RUNABLE: _JAR_RUNABLE {
-        .ALLOWED=JAVA_RUNTIME_PEERDIR JAVA_RUNTIME_EXCLUDE
-        .IGNORED=JAVA_SRCS RUN_JAVA_PROGRAM
-        .ALIASES=EXCLUDE=_NOOP_MACRO PEERDIR=_NOOP_MACRO DEPENDENCY_MANAGEMENT=_NOOP_MACRO JAVA_RUNTIME_PEERDIR=PEERDIR JAVA_RUNTIME_EXCLUDE=EXCLUDE
-        .PEERDIRSELF=JAR_COMPILATION
-
-        SET(MODULE_TYPE JAVA_PROGRAM)
-    }
-    module JAR_COMPILATION: JAR_LIBRARY {
-        .ALIASES=JAVA_RUNTIME_PEERDIR=_NOOP_MACRO JAVA_RUNTIME_EXCLUDE=_NOOP_MACRO
-        .FINAL_TARGET=no
-        SET(MODULE_TYPE JAVA_PROGRAM)
-    }
-}
-
+multimodule JAR_PROGRAM { 
+    module JAR_RUNABLE: _JAR_RUNABLE { 
+        .ALLOWED=JAVA_RUNTIME_PEERDIR JAVA_RUNTIME_EXCLUDE 
+        .IGNORED=JAVA_SRCS RUN_JAVA_PROGRAM 
+        .ALIASES=EXCLUDE=_NOOP_MACRO PEERDIR=_NOOP_MACRO DEPENDENCY_MANAGEMENT=_NOOP_MACRO JAVA_RUNTIME_PEERDIR=PEERDIR JAVA_RUNTIME_EXCLUDE=EXCLUDE 
+        .PEERDIRSELF=JAR_COMPILATION 
+ 
+        SET(MODULE_TYPE JAVA_PROGRAM) 
+    } 
+    module JAR_COMPILATION: JAR_LIBRARY { 
+        .ALIASES=JAVA_RUNTIME_PEERDIR=_NOOP_MACRO JAVA_RUNTIME_EXCLUDE=_NOOP_MACRO 
+        .FINAL_TARGET=no 
+        SET(MODULE_TYPE JAVA_PROGRAM) 
+    } 
+} 
+ 
 # tag:java-specific
-LINK_JAR_TEST=${YMAKE_PYTHON} ${input:"build/scripts/writer.py"} --file ${BINDIR}/run-bf.txt -Q -m --ya-start-command-file ${ext=.jar:MANAGED_PEERS_CLOSURE} --ya-end-command-file && ${YMAKE_PYTHON} ${input:"build/scripts/make_manifest_from_bf.py"} ${BINDIR}/run-bf.txt ${TARGET}
-YMAKE_JAVA_TEST=
-module _JAR_TEST: _COMPILABLE_JAR_BASE {
-    .FINAL_TARGET=yes
-    .CMD=LINK_JAR_TEST
-    CONSUME_NON_MANAGEABLE_PEERS=yes
-
-    SET(MODULE_SUFFIX .test.cp.jar)
-    ENABLE(YMAKE_JAVA_TEST)
-    JAVA_TEST()
+LINK_JAR_TEST=${YMAKE_PYTHON} ${input:"build/scripts/writer.py"} --file ${BINDIR}/run-bf.txt -Q -m --ya-start-command-file ${ext=.jar:MANAGED_PEERS_CLOSURE} --ya-end-command-file && ${YMAKE_PYTHON} ${input:"build/scripts/make_manifest_from_bf.py"} ${BINDIR}/run-bf.txt ${TARGET} 
+YMAKE_JAVA_TEST= 
+module _JAR_TEST: _COMPILABLE_JAR_BASE { 
+    .FINAL_TARGET=yes 
+    .CMD=LINK_JAR_TEST 
+    CONSUME_NON_MANAGEABLE_PEERS=yes 
+ 
+    SET(MODULE_SUFFIX .test.cp.jar) 
+    ENABLE(YMAKE_JAVA_TEST) 
+    JAVA_TEST() 
     CHECK_PROVIDES()
-}
-
+} 
+ 
 # tag:java-specific
-multimodule JUNIT5_YMAKE {
-    module JAR_TESTABLE: _JAR_TEST {
-        .ALLOWED=JAVA_TEST_PEERDIR
-        .IGNORED=JAVA_SRCS RUN_JAVA_PROGRAM
-        .ALIASES=EXCLUDE=_NOOP_MACRO PEERDIR=_NOOP_MACRO DEPENDENCY_MANAGEMENT=_NOOP_MACRO JAVA_TEST_PEERDIR=PEERDIR
-        .PEERDIRSELF=JAR_COMPILATION
-
-        SET(MODULE_TYPE JUNIT5)
-    }
-    module JAR_COMPILATION: JAR_LIBRARY {
-        .IGNORED=JAVA_TEST_PEERDIR
-        .ALIASES=JAVA_TEST_PEERDIR=_NOOP_MACRO
-        .FINAL_TARGET=no
-
-        PEERDIR(devtools/junit5-runner build/platform/java/jacoco-agent)
-    }
-}
-
+multimodule JUNIT5_YMAKE { 
+    module JAR_TESTABLE: _JAR_TEST { 
+        .ALLOWED=JAVA_TEST_PEERDIR 
+        .IGNORED=JAVA_SRCS RUN_JAVA_PROGRAM 
+        .ALIASES=EXCLUDE=_NOOP_MACRO PEERDIR=_NOOP_MACRO DEPENDENCY_MANAGEMENT=_NOOP_MACRO JAVA_TEST_PEERDIR=PEERDIR 
+        .PEERDIRSELF=JAR_COMPILATION 
+ 
+        SET(MODULE_TYPE JUNIT5) 
+    } 
+    module JAR_COMPILATION: JAR_LIBRARY { 
+        .IGNORED=JAVA_TEST_PEERDIR 
+        .ALIASES=JAVA_TEST_PEERDIR=_NOOP_MACRO 
+        .FINAL_TARGET=no 
+ 
+        PEERDIR(devtools/junit5-runner build/platform/java/jacoco-agent) 
+    } 
+} 
+ 
 # tag:java-specific
-multimodule JTEST_YMAKE {
-    module JAR_TESTABLE: _JAR_TEST {
-        .ALLOWED=YT_SPEC
-        .IGNORED=JAVA_SRCS RUN_JAVA_PROGRAM
-        .ALIASES=EXCLUDE=_NOOP_MACRO PEERDIR=_NOOP_MACRO DEPENDENCY_MANAGEMENT=_NOOP_MACRO JAVA_TEST_PEERDIR=PEERDIR
-        .PEERDIRSELF=JAR_COMPILATION
-
-        SET(MODULE_TYPE JTEST)
-        PEERDIR(devtools/junit-runner)
-        DEPENDENCY_MANAGEMENT(contrib/java/org/hamcrest/hamcrest-core/1.3 contrib/java/com/google/code/gson/gson/2.8.6 contrib/java/com/beust/jcommander/1.72 contrib/java/junit/junit/4.12)
-    }
-    module JAR_COMPILATION: JAR_LIBRARY {
-        .ALIASES=JAVA_TEST_PEERDIR=_NOOP_MACRO
-        .ALLOWED=YT_SPEC
-        .FINAL_TARGET=no
-
-        DEPENDS(contrib/java/org/sonarsource/scanner/cli/sonar-scanner-cli/2.8)
-        PEERDIR(build/platform/java/jacoco-agent)
-    }
-}
-
+multimodule JTEST_YMAKE { 
+    module JAR_TESTABLE: _JAR_TEST { 
+        .ALLOWED=YT_SPEC 
+        .IGNORED=JAVA_SRCS RUN_JAVA_PROGRAM 
+        .ALIASES=EXCLUDE=_NOOP_MACRO PEERDIR=_NOOP_MACRO DEPENDENCY_MANAGEMENT=_NOOP_MACRO JAVA_TEST_PEERDIR=PEERDIR 
+        .PEERDIRSELF=JAR_COMPILATION 
+ 
+        SET(MODULE_TYPE JTEST) 
+        PEERDIR(devtools/junit-runner) 
+        DEPENDENCY_MANAGEMENT(contrib/java/org/hamcrest/hamcrest-core/1.3 contrib/java/com/google/code/gson/gson/2.8.6 contrib/java/com/beust/jcommander/1.72 contrib/java/junit/junit/4.12) 
+    } 
+    module JAR_COMPILATION: JAR_LIBRARY { 
+        .ALIASES=JAVA_TEST_PEERDIR=_NOOP_MACRO 
+        .ALLOWED=YT_SPEC 
+        .FINAL_TARGET=no 
+ 
+        DEPENDS(contrib/java/org/sonarsource/scanner/cli/sonar-scanner-cli/2.8) 
+        PEERDIR(build/platform/java/jacoco-agent) 
+    } 
+} 
+ 
 # tag:python-specific tag:deprecated
 ### @usage: PY2_LIBRARY() # deprecated
 ###
@@ -4073,9 +4073,9 @@ module _PY3_LIBRARY: _LIBRARY {
     .RESTRICTED=PYTHON3_ADDINCL USE_PYTHON3 PYTHON2_ADDINCL USE_PYTHON2 OPTIMIZE_PY_PROTOS NO_OPTIMIZE_PY_PROTOS
     USE_GLOBAL_CMD=yes
 
-    PEERDIR($YMAKE_PYTHON3_PEER)
-    RUN_CYTHON_SCRIPT=$YMAKE_PYTHON3 $CYTHON_SCRIPT
-
+    PEERDIR($YMAKE_PYTHON3_PEER) 
+    RUN_CYTHON_SCRIPT=$YMAKE_PYTHON3 $CYTHON_SCRIPT 
+ 
     when ($PY_PROTO_MYPY_ENABLED == "yes") {
         PY_PROTO_MYPY_SUFFIX=_pb2.pyi
         PY_PROTO_MYPY_PLUGIN=$PY_PROTO_MYPY_PLUGIN_BASE ${output;hide;noauto;norel;nopath;noext;suf=_pb2.pyi:File}
@@ -4260,7 +4260,7 @@ when ($JDK_VERSION == "10") {
 when ($JDK_VERSION == "8") {
     JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk8 build/platform/java/jdk/jdk11
 }
-
+ 
 # tag:java-specific
 when ($JDK_VERSION == "17") {
     UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar17
@@ -4355,10 +4355,10 @@ otherwise {
 }
 
 # tag:java-specific
-when ($USE_SYSTEM_UBERJAR) {
-    UBERJAR_RESOURCE=$USE_SYSTEM_UBERJAR
-}
-otherwise {
+when ($USE_SYSTEM_UBERJAR) { 
+    UBERJAR_RESOURCE=$USE_SYSTEM_UBERJAR 
+} 
+otherwise { 
     when ($JDK_VERSION == "17") {
         UBERJAR_RESOURCE=$UBERJAR17_RESOURCE_GLOBAL
     }
@@ -4386,8 +4386,8 @@ otherwise {
     when ($JDK_VERSION == "8") {
         UBERJAR_RESOURCE=$UBERJAR8_RESOURCE_GLOBAL
     }
-}
-
+} 
+ 
 # tag:java-specific
 when ($JDK_VERSION == "17") {
     WITH_JDK_RESOURCE=$WITH_JDK17_RESOURCE_GLOBAL
@@ -4513,7 +4513,7 @@ macro UBERJAR() {
 
 # tag:java-specific
 UBERJAR_PREFIX_VALUE=
-UBERJAR_PREFIX_FLAG=
+UBERJAR_PREFIX_FLAG= 
 ### @usage: UBERJAR_HIDING_PREFIX(Arg)
 ###
 ### Set prefix for classes to shade. All classes in UBERJAR will be moved into package prefixed with Arg.
@@ -4522,12 +4522,12 @@ UBERJAR_PREFIX_FLAG=
 ### @see: [UBERJAR](#macro_UBERJAR)
 macro UBERJAR_HIDING_PREFIX(Arg) {
     SET(UBERJAR_PREFIX_VALUE $Arg)
-    SET(UBERJAR_PREFIX_FLAG ${pre=--shade-prefix :Arg})
+    SET(UBERJAR_PREFIX_FLAG ${pre=--shade-prefix :Arg}) 
 }
 
 # tag:java-specific
 UBERJAR_HIDE_EXCLUDE_VALUE=
-UBERJAR_HIDE_EXCLUDE_FLAGS=
+UBERJAR_HIDE_EXCLUDE_FLAGS= 
 ### @usage: UBERJAR_HIDE_EXCLUDE_PATTERN(Args...)
 ###
 ### Exculude classes matching this patterns from shading (if enabled).
@@ -4537,11 +4537,11 @@ UBERJAR_HIDE_EXCLUDE_FLAGS=
 ### @see: [UBERJAR](#macro_UBERJAR), [UBERJAR_HIDING_PREFIX](#macro_UBERJAR_HIDING_PREFIX)
 macro UBERJAR_HIDE_EXCLUDE_PATTERN(Args...) {
     SET_APPEND(UBERJAR_HIDE_EXCLUDE_VALUE $ARGS_DELIM $Args)
-    SET_APPEND(UBERJAR_HIDE_EXCLUDE_FLAGS ${pre=--shade-exclude :Args})
+    SET_APPEND(UBERJAR_HIDE_EXCLUDE_FLAGS ${pre=--shade-exclude :Args}) 
 }
 
 # tag:java-specific
-UBERJAR_PATH_EXCLUDES=
+UBERJAR_PATH_EXCLUDES= 
 UBERJAR_PATH_EXCLUDE_VALUE=
 ### @usage: UBERJAR_PATH_EXCLUDE_PREFIX(Args...)
 ###
@@ -4551,12 +4551,12 @@ UBERJAR_PATH_EXCLUDE_VALUE=
 ### @see: [UBERJAR](#macro_UBERJAR)
 macro UBERJAR_PATH_EXCLUDE_PREFIX(Args...) {
     SET_APPEND(UBERJAR_PATH_EXCLUDE_VALUE $ARGS_DELIM $Args)
-    SET_APPEND(UBERJAR_PATH_EXCLUDES ${pre=--uber-exclude :Args})
+    SET_APPEND(UBERJAR_PATH_EXCLUDES ${pre=--uber-exclude :Args}) 
 }
 
 # tag:java-specific
 UBERJAR_MANIFEST_TRANSFORMER_MAIN_VALUE=
-UBERJAR_MANIFEST_TRANSFORMER_MAIN_FLAG=
+UBERJAR_MANIFEST_TRANSFORMER_MAIN_FLAG= 
 ### @usage: UBERJAR_MANIFEST_TRANSFORMER_MAIN(Main)
 ###
 ### Transform manifest.mf for UBERJAR() java programs, set main-class attribute
@@ -4564,12 +4564,12 @@ UBERJAR_MANIFEST_TRANSFORMER_MAIN_FLAG=
 ### @see: [UBERJAR](#macro_UBERJAR)
 macro UBERJAR_MANIFEST_TRANSFORMER_MAIN(Main) {
     SET(UBERJAR_MANIFEST_TRANSFORMER_MAIN_VALUE $Main)
-    SET(UBERJAR_MANIFEST_TRANSFORMER_MAIN_FLAG --manifest-main $Main)
+    SET(UBERJAR_MANIFEST_TRANSFORMER_MAIN_FLAG --manifest-main $Main) 
 }
 
 # tag:java-specific
 UBERJAR_MANIFEST_TRANSFORMER_ATTRIBUTE_VALUE=
-UBERJAR_MANIFEST_TRANSFORMER_ATTRIBUTE_FLAGS=
+UBERJAR_MANIFEST_TRANSFORMER_ATTRIBUTE_FLAGS= 
 ### @usage: UBERJAR_MANIFEST_TRANSFORMER_ATTRIBUTE(Key, Value)
 ###
 ### Transform manifest.mf for UBERJAR() java programs, set attribute
@@ -4577,12 +4577,12 @@ UBERJAR_MANIFEST_TRANSFORMER_ATTRIBUTE_FLAGS=
 ### @see: [UBERJAR](#macro_UBERJAR)
 macro UBERJAR_MANIFEST_TRANSFORMER_ATTRIBUTE(Key, Value) {
     SET_APPEND(UBERJAR_MANIFEST_TRANSFORMER_ATTRIBUTE_VALUE $ARGS_DELIM $Key : $Value)
-    SET_APPEND(UBERJAR_MANIFEST_TRANSFORMER_ATTRIBUTE_FLAGS --manifest-attribute ${Key}:${Value})
+    SET_APPEND(UBERJAR_MANIFEST_TRANSFORMER_ATTRIBUTE_FLAGS --manifest-attribute ${Key}:${Value}) 
 }
 
 # tag:java-specific
 UBERJAR_APPENDING_TRANSFORMER_VALUE=
-UBERJAR_APPENDING_TRANSFORMER_FLAGS=
+UBERJAR_APPENDING_TRANSFORMER_FLAGS= 
 ### @usage: UBERJAR_APPENDING_TRANSFORMER(Resource)
 ###
 ### Add AppendingTransformer for UBERJAR() java programs
@@ -4593,12 +4593,12 @@ UBERJAR_APPENDING_TRANSFORMER_FLAGS=
 ### @see: [UBERJAR](#macro_UBERJAR)
 macro UBERJAR_APPENDING_TRANSFORMER(Resources...) {
     SET_APPEND(UBERJAR_APPENDING_TRANSFORMER_VALUE $ARGS_DELIM $Resources)
-    SET_APPEND(UBERJAR_APPENDING_TRANSFORMER_FLAGS ${pre=--append-transformer :Resources})
+    SET_APPEND(UBERJAR_APPENDING_TRANSFORMER_FLAGS ${pre=--append-transformer :Resources}) 
 }
 
 # tag:java-specific
 UBERJAR_SERVICES_RESOURCE_TRANSFORMER_VALUE=
-UBERJAR_SERVICES_RESOURCE_TRANSFORMER_FLAG=
+UBERJAR_SERVICES_RESOURCE_TRANSFORMER_FLAG= 
 ### @usage: UBERJAR_SERVICES_RESOURCE_TRANSFORMER()
 ###
 ### Add ServicesResourceTransformer for UBERJAR() java programs
@@ -4606,7 +4606,7 @@ UBERJAR_SERVICES_RESOURCE_TRANSFORMER_FLAG=
 ### @see: [UBERJAR](#macro_UBERJAR)
 macro UBERJAR_SERVICES_RESOURCE_TRANSFORMER() {
     SET(UBERJAR_SERVICES_RESOURCE_TRANSFORMER_VALUE yes)
-    SET(UBERJAR_SERVICES_RESOURCE_TRANSFORMER_FLAG --service-transformer)
+    SET(UBERJAR_SERVICES_RESOURCE_TRANSFORMER_FLAG --service-transformer) 
 }
 
 # tag:idea-specific
@@ -4645,7 +4645,7 @@ JAVAC_FLAGS_VALUE=
 ###
 ### Set additional Java compilation flags.
 macro JAVAC_FLAGS(Args...) {
-    SET_APPEND(JAVAC_OPTS $Args)
+    SET_APPEND(JAVAC_OPTS $Args) 
     SET_APPEND(JAVAC_FLAGS_VALUE $ARGS_DELIM $Args)
 }
 
@@ -4737,20 +4737,20 @@ macro ADD_DLLS_TO_JAR() {
 }
 
 # tag:java-specific
-MANAGED_PEERS=
-MANAGED_PEERS_CLOSURE=
-RUN_JAVA_PROGRAM_MANAGED=
-MANAGEABLE_PEERS_ROOTS=contrib/java
-HAS_MANAGEABLE_PEERS=no
-PROPAGATES_MANAGEABLE_PEERS=no
-YMAKE_CLASSPATH_CHECKS=yes
-# All items of this list must be PEERS, GHOST PEERS or TOOLS of the test module or module itself.
-# All items of this list must has at least one of HAS_MANAGEABLE_PEERS or PROPAGATES_MANAGEABLE_PEERS flags set yes.
-# This variable is used by JUnit tests but not TestNG.
-TEST_CLASSPATH_VALUE=
-# Calculated and replaced by ymake can be used in DART DATA
-TEST_CLASSPATH_MANAGED=
-
+MANAGED_PEERS= 
+MANAGED_PEERS_CLOSURE= 
+RUN_JAVA_PROGRAM_MANAGED= 
+MANAGEABLE_PEERS_ROOTS=contrib/java 
+HAS_MANAGEABLE_PEERS=no 
+PROPAGATES_MANAGEABLE_PEERS=no 
+YMAKE_CLASSPATH_CHECKS=yes 
+# All items of this list must be PEERS, GHOST PEERS or TOOLS of the test module or module itself. 
+# All items of this list must has at least one of HAS_MANAGEABLE_PEERS or PROPAGATES_MANAGEABLE_PEERS flags set yes. 
+# This variable is used by JUnit tests but not TestNG. 
+TEST_CLASSPATH_VALUE= 
+# Calculated and replaced by ymake can be used in DART DATA 
+TEST_CLASSPATH_MANAGED= 
+ 
 # tag:java-specific
 DEPENDENCY_MANAGEMENT_VALUE=
 ### @usage: DEPENDENCY_MANAGEMENT(path/to/lib1 path/to/lib2 ...)
@@ -4772,7 +4772,7 @@ DEPENDENCY_MANAGEMENT_VALUE=
 ### Documentation: https://wiki.yandex-team.ru/yatool/java/
 macro DEPENDENCY_MANAGEMENT(Args...) {
     SET_APPEND(DEPENDENCY_MANAGEMENT_VALUE $ARGS_DELIM $Args)
-    _GHOST_PEERDIR($Args)
+    _GHOST_PEERDIR($Args) 
 }
 
 # tag:java-specific
@@ -4860,10 +4860,10 @@ macro JAVA_EXTERNAL_DEPENDENCIES(Args...) {
 module _JAVA_PLACEHOLDER: _BASE_UNIT  {
     .CMD=TOUCH_JAVA_UNIT
     .FINAL_TARGET=yes
-    .ALLOWED=DEPENDENCY_MANAGEMENT EXCLUDE
-    .ALIASES=RUN_JAVA_PROGRAM=_RUN_JBUILD_PROGRAM
-    HAS_MANAGEABLE_PEERS=yes
-    DYNAMIC_LINK=yes
+    .ALLOWED=DEPENDENCY_MANAGEMENT EXCLUDE 
+    .ALIASES=RUN_JAVA_PROGRAM=_RUN_JBUILD_PROGRAM 
+    HAS_MANAGEABLE_PEERS=yes 
+    DYNAMIC_LINK=yes 
     PEERDIR_TAGS=JAVA_PROTO JAVA_FBS JAVA_IDL JAR_COMPILATION
     PEERDIR(build/platform/java/jdk)
     PEERDIR+=$JDK_RESOURCE_PEERDIR
@@ -4872,15 +4872,15 @@ module _JAVA_PLACEHOLDER: _BASE_UNIT  {
         PEERDIR+=$UBERJAR_RESOURCE_PEERDIR
     }
     when($ERROR_PRONE_VALUE) {
-        # Jbuild assumes hardcoded resource name https://a.yandex-team.ru/arc_vcs/devtools/ya/jbuild/gen/consts/__init__.py?rev=1739368ed5aaa585b8300b84e5dea708a2bedd3a#L130
-        # adding default peerdir as a hack to make `ya ide idea` and `ya maven-export` work for now
-        PEERDIR+=build/platform/java/error_prone
-        PEERDIR+=$ERROR_PRONE_PEERDIR
+        # Jbuild assumes hardcoded resource name https://a.yandex-team.ru/arc_vcs/devtools/ya/jbuild/gen/consts/__init__.py?rev=1739368ed5aaa585b8300b84e5dea708a2bedd3a#L130 
+        # adding default peerdir as a hack to make `ya ide idea` and `ya maven-export` work for now 
+        PEERDIR+=build/platform/java/error_prone 
+        PEERDIR+=$ERROR_PRONE_PEERDIR 
     }
-    # in the ideal world this statement must be under condition bellow
-    DEPENDENCY_MANAGEMENT(contrib/java/org/jetbrains/kotlin/kotlin-stdlib-jdk8/${KOTLIN_VERSION})
+    # in the ideal world this statement must be under condition bellow 
+    DEPENDENCY_MANAGEMENT(contrib/java/org/jetbrains/kotlin/kotlin-stdlib-jdk8/${KOTLIN_VERSION}) 
     when($WITH_KOTLIN_VALUE) {
-        PEERDIR+=build/platform/java/kotlin contrib/java/org/jetbrains/kotlin/kotlin-stdlib-jdk8
+        PEERDIR+=build/platform/java/kotlin contrib/java/org/jetbrains/kotlin/kotlin-stdlib-jdk8 
         when($WITH_KOTLINC_PLUGIN_ALLOPEN) {
             KOTLINC_OPTS_VALUE+=-Xplugin=${KOTLIN_COMPILER_RESOURCE_GLOBAL}/plugins/kotlin-allopen-plugin.jar
         }
@@ -4893,14 +4893,14 @@ module _JAVA_PLACEHOLDER: _BASE_UNIT  {
     }
 
     when($ERROR_PRONE_VALUE && $JDK_VERSION == "16") {
-        JAVAC_FLAGS_VALUE+=$ERROR_PRONE_JDK16_ADD_OPENS
+        JAVAC_FLAGS_VALUE+=$ERROR_PRONE_JDK16_ADD_OPENS 
     }
 
     when($ERROR_PRONE_VALUE && $ERROR_PRONE_VERSION == "2.7.1") {
-        JAVAC_FLAGS_VALUE+=$ERROR_PRONE_2_7_1_FORCED_OPTS
+        JAVAC_FLAGS_VALUE+=$ERROR_PRONE_2_7_1_FORCED_OPTS 
     }
 
-    JAVA_DEPENDENCIES_CONFIGURATION(FORBID_DEFAULT_VERSIONS)
+    JAVA_DEPENDENCIES_CONFIGURATION(FORBID_DEFAULT_VERSIONS) 
     DISABLE(NEED_PLATFORM_PEERDIRS)
     NO_PLATFORM()
     JAVA_MODULE()
@@ -4956,7 +4956,7 @@ macro JAVA_DEPENDENCIES_CONFIGURATION(Args...) {
 }
 
 # tag:java-specific
-# TODO(DEVTOOLS-6901): remove this variable when there are no more references to it in jbuild
+# TODO(DEVTOOLS-6901): remove this variable when there are no more references to it in jbuild 
 JAVA_FORBIDDEN_LIBRARIES_VALUE=
 
 # tag:java-specific
@@ -5017,36 +5017,36 @@ multimodule SANDBOX_TASK {
 }
 
 # tag:sandbox-specific
-multimodule SANDBOX_PY23_TASK {
+multimodule SANDBOX_PY23_TASK { 
     module SB_TASK_BIN: _PY2_PROGRAM {
-        PY_MAIN(sandbox.taskbox.binary)
-        PEERDIR(sandbox/bin sandbox/sdk2 sandbox/sandboxsdk sandbox/taskbox/worker)
-        SET_APPEND(NO_CHECK_IMPORTS_FOR_VALUE api.*)
-        SET_APPEND(NO_CHECK_IMPORTS_FOR_VALUE kernel.*)
-        SET_APPEND(NO_CHECK_IMPORTS_FOR_VALUE library.*)
-        SET_APPEND(NO_CHECK_IMPORTS_FOR_VALUE sky*)
+        PY_MAIN(sandbox.taskbox.binary) 
+        PEERDIR(sandbox/bin sandbox/sdk2 sandbox/sandboxsdk sandbox/taskbox/worker) 
+        SET_APPEND(NO_CHECK_IMPORTS_FOR_VALUE api.*) 
+        SET_APPEND(NO_CHECK_IMPORTS_FOR_VALUE kernel.*) 
+        SET_APPEND(NO_CHECK_IMPORTS_FOR_VALUE library.*) 
+        SET_APPEND(NO_CHECK_IMPORTS_FOR_VALUE sky*) 
         REGISTER_SANDBOX_IMPORT(${MODDIR})
-    }
-    module PY2: PY2_LIBRARY {
-        PEERDIR(sandbox/sdk2 sandbox/sandboxsdk)
+    } 
+    module PY2: PY2_LIBRARY { 
+        PEERDIR(sandbox/sdk2 sandbox/sandboxsdk) 
         REGISTER_SANDBOX_IMPORT(${MODDIR})
-        OBJ_SUF=.py2
-        RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT
-    }
-    module PY3: PY3_LIBRARY {
-        when ($MSVC == "yes" || $CYGWIN == "yes") {
-            MODULE_PREFIX=py3
-        }
-        otherwise {
-             MODULE_PREFIX=libpy3
-        }
-        OBJ_SUF=.py3
-        RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT
-        PEERDIR(sandbox/sdk2)
+        OBJ_SUF=.py2 
+        RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT 
+    } 
+    module PY3: PY3_LIBRARY { 
+        when ($MSVC == "yes" || $CYGWIN == "yes") { 
+            MODULE_PREFIX=py3 
+        } 
+        otherwise { 
+             MODULE_PREFIX=libpy3 
+        } 
+        OBJ_SUF=.py3 
+        RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT 
+        PEERDIR(sandbox/sdk2) 
         REGISTER_SANDBOX_IMPORT(${MODDIR})
-    }
-}
-
+    } 
+} 
+ 
 # tag:sandbox-specific
 ### @usage: SANDBOX_PY3_TASK([Name])
 ###
@@ -5576,7 +5576,7 @@ macro SIZE(Type) {
 ### You should specify file name with the extension as Out. Futher 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} && modules_required yandex_common.cmake
+    .SEM=target_joined_source $Out ${input:Src} ${output;hide;suf=.o:Out} && modules_required yandex_common.cmake 
     _CONDITIONAL_SRCS($TIDY_VALUE $Src)
 }
 
@@ -5711,8 +5711,8 @@ macro ADDINCLSELF(FOR="") {
     }
 }
 
-COMPILE_OUT_SUFFIX=
-_COMPILE_OUTPUTS=${output;suf=${COMPILE_OUT_SUFFIX}${OBJECT_SUF}:SRC}
+COMPILE_OUT_SUFFIX= 
+_COMPILE_OUTPUTS=${output;suf=${COMPILE_OUT_SUFFIX}${OBJECT_SUF}:SRC} 
 _COMPILE_TIME_TRACE_OUTPUTS=${output;noauto;suf=${COMPILE_OUT_SUFFIX}${OBJECT_SUF}.time_trace.json:SRC}
 
 macro SET_COMPILE_OUTPUTS_MODIFIERS(NOREL?";norel":"") {
@@ -5736,7 +5736,7 @@ macro _SRC(EXT, SRC, SRCFLAGS...) {
 # tag:src-processing
 macro _SRC("S", SRC, SRCFLAGS...) {
     .CMD=$C_COMPILER $C_FLAGS_PLATFORM $CFLAGS $SFLAGS $SRCFLAGS -c -o ${output:SRC.o} ${input:SRC} ${pre=-I:_C__INCLUDE}
-    .SEM=add_asm_source ${input:SRC} ${output;hide;suf=.o:SRC}
+    .SEM=add_asm_source ${input:SRC} ${output;hide;suf=.o:SRC} 
 }
 
 # tag:src-processing
@@ -5813,7 +5813,7 @@ macro _SRC("asp", SRC, SRCFLAGS...) {
 # tag:src-processing
 macro _SRC("rl6", SRC, SRCFLAGS...) {
     .CMD=$RUN_NO_SANITIZE ${tool:"contrib/tools/ragel6"} $RAGEL6_FLAGS ${SRCFLAGS} -L -I${ARCADIA_ROOT} -o ${output;nopath;noext;defext=.rl6.cpp:SRC} ${input:SRC} ${kv;hide:"p R6"} ${kv;hide:"pc yellow"}
-    .SEM=target_ragel_lexers PRIVATE ${input:SRC} ${output;hide;suf=.o:SRC} $RAGEL6_FLAGS ${SRCFLAGS} && set_global_flags RAGEL_FLAGS -L -I $S/ && conan_require ragel/6.10 && conan_import '"bin, ragel* -> ./bin"' && modules_required yandex_common.cmake
+    .SEM=target_ragel_lexers PRIVATE ${input:SRC} ${output;hide;suf=.o:SRC} $RAGEL6_FLAGS ${SRCFLAGS} && set_global_flags RAGEL_FLAGS -L -I $S/ && conan_require ragel/6.10 && conan_import '"bin, ragel* -> ./bin"' && modules_required yandex_common.cmake 
 }
 
 # tag:src-processing
@@ -5850,7 +5850,7 @@ macro _SRC("ev", SRC, SRCFLAGS...) {
 # tag:src-processing
 macro _SRC("proto", SRC, SRCFLAGS...) {
     .CMD=$PROTO_CMD($SRC)
-    .SEM=$PROTO_CMD($SRC)
+    .SEM=$PROTO_CMD($SRC) 
 }
 
 # tag:src-processing
@@ -5869,7 +5869,7 @@ macro _SRC("cfgproto", SRC, SRCFLAGS...) {
 # tag:src-processing
 macro _SRC("pyx", SRC, SRCFLAGS...) {
     # Copy-paste from BUILDWITH_CYTHON
-    .CMD=$RUN_CYTHON_SCRIPT $CYTHON_OPTIONS --cplus ${CYTHON_CPP_OUTPUT_INCLUDES} ${pre=-I:_CYTHON__INCLUDE} ${input:SRC} -o ${output;tobindir:SRC.cpp} $CYTHON_OUTPUT_INCLUDES ${SRCFLAGS} ${requirements;hide:PY_REQUIREMENTS} ${kv;hide:"p CY"} ${kv;hide:"pc yellow"}
+    .CMD=$RUN_CYTHON_SCRIPT $CYTHON_OPTIONS --cplus ${CYTHON_CPP_OUTPUT_INCLUDES} ${pre=-I:_CYTHON__INCLUDE} ${input:SRC} -o ${output;tobindir:SRC.cpp} $CYTHON_OUTPUT_INCLUDES ${SRCFLAGS} ${requirements;hide:PY_REQUIREMENTS} ${kv;hide:"p CY"} ${kv;hide:"pc yellow"} 
     .ADDINCL=FOR cython contrib/tools/cython/Cython/Includes
 }
 
@@ -5898,7 +5898,7 @@ macro _SRC("f", SRC, SRCFLAGS...) {
 # tag:src-processing
 macro _SRC("cpp", SRC, SRCFLAGS...) {
     .CMD=$_SRC_cpp($SRC $SRCFLAGS)
-    .SEM=target_sources PRIVATE ${input:SRC} ${output;hide;suf=.o:SRC}
+    .SEM=target_sources PRIVATE ${input:SRC} ${output;hide;suf=.o:SRC} 
 }
 
 # tag:src-processing
@@ -5909,7 +5909,7 @@ macro _SRC("cxx", SRC, SRCFLAGS...) {
 # tag:src-processing
 macro _SRC("cc", SRC, SRCFLAGS...) {
     .CMD=$_SRC(cpp $SRC $SRCFLAGS)
-    .SEM=target_sources PRIVATE ${input:SRC} ${output;hide;suf=.o:SRC}
+    .SEM=target_sources PRIVATE ${input:SRC} ${output;hide;suf=.o:SRC} 
 }
 
 # tag:src-processing
@@ -5920,7 +5920,7 @@ macro _SRC("C", SRC, SRCFLAGS...) {
 # tag:src-processing
 macro _SRC("c", SRC, SRCFLAGS...) {
     .CMD=$_SRC_c($SRC $SRCFLAGS)
-    .SEM=target_sources PRIVATE ${input:SRC} ${output;hide;suf=.o:SRC}
+    .SEM=target_sources PRIVATE ${input:SRC} ${output;hide;suf=.o:SRC} 
 }
 
 # tag:src-processing
@@ -5936,13 +5936,13 @@ macro _SRC("masm", SRC, SRCFLAGS...) {
 # tag:src-processing
 macro _SRC("yasm", SRC, SRCFLAGS...) {
     .CMD=$_SRC_yasm($SRC $SRCFLAGS PREINCLUDES $YASM_PREINCLUDES_VALUE)
-    .SEM=target_yasm_source PRIVATE ${input:SRC} ${output;hide;suf=.o:SRC} $YASM_FLAGS ${pre=-I :_ASM__INCLUDE} $SRCFLAGS ${pre=-P :PREINCLUDES} && set_global_flags YASM_FLAGS -f ${_YASM_FMT_VALUE}${HARDWARE_ARCH} $_YASM_PLATFORM_FLAGS_VALUE -D ${pre=_;suf=_:HARDWARE_TYPE} -D_YASM_ $ASM_PREFIX_VALUE $_YASM_PREDEFINED_FLAGS_VALUE && conan_require yasm/1.3.0 && conan_import '"bin, *yasm* -> ./bin"' && conan_import '"bin, ytasm* -> ./bin"' && modules_required yandex_common.cmake
+    .SEM=target_yasm_source PRIVATE ${input:SRC} ${output;hide;suf=.o:SRC} $YASM_FLAGS ${pre=-I :_ASM__INCLUDE} $SRCFLAGS ${pre=-P :PREINCLUDES} && set_global_flags YASM_FLAGS -f ${_YASM_FMT_VALUE}${HARDWARE_ARCH} $_YASM_PLATFORM_FLAGS_VALUE -D ${pre=_;suf=_:HARDWARE_TYPE} -D_YASM_ $ASM_PREFIX_VALUE $_YASM_PREDEFINED_FLAGS_VALUE && conan_require yasm/1.3.0 && conan_import '"bin, *yasm* -> ./bin"' && conan_import '"bin, ytasm* -> ./bin"' && modules_required yandex_common.cmake 
 }
 
 # tag:src-processing
 macro _SRC("asm", SRC, SRCFLAGS...) {
     .CMD=$_SRC(yasm $SRC $SRCFLAGS)
-    .SEM=target_yasm_source PRIVATE ${input:SRC} ${output;hide;suf=.o:SRC} $YASM_FLAGS ${pre=-I :_ASM__INCLUDE} $SRCFLAGS && set_global_flags YASM_FLAGS -f ${_YASM_FMT_VALUE}${HARDWARE_ARCH} $_YASM_PLATFORM_FLAGS_VALUE -D ${pre=_;suf=_:HARDWARE_TYPE} -D_YASM_ $ASM_PREFIX_VALUE $_YASM_PREDEFINED_FLAGS_VALUE && conan_require yasm/1.3.0 && conan_import '"bin, *yasm* -> ./bin"' && conan_import '"bin, ytasm* -> ./bin"' && modules_required yandex_common.cmake
+    .SEM=target_yasm_source PRIVATE ${input:SRC} ${output;hide;suf=.o:SRC} $YASM_FLAGS ${pre=-I :_ASM__INCLUDE} $SRCFLAGS && set_global_flags YASM_FLAGS -f ${_YASM_FMT_VALUE}${HARDWARE_ARCH} $_YASM_PLATFORM_FLAGS_VALUE -D ${pre=_;suf=_:HARDWARE_TYPE} -D_YASM_ $ASM_PREFIX_VALUE $_YASM_PREDEFINED_FLAGS_VALUE && conan_require yasm/1.3.0 && conan_import '"bin, *yasm* -> ./bin"' && conan_import '"bin, ytasm* -> ./bin"' && modules_required yandex_common.cmake 
 }
 
 # tag:src-processing
@@ -6031,12 +6031,12 @@ when ($CLANG == "yes" || $GCC == "yes") {
 }
 
 # tag:src-processing
-macro _SRC_cpp(SRC, COMPILE_OUT_SUFFIX="", SRCFLAGS...) {
+macro _SRC_cpp(SRC, COMPILE_OUT_SUFFIX="", SRCFLAGS...) { 
     .CMD=$_SRC_CPP_CMD
 }
 
 # tag:src-processing
-macro _SRC_c(SRC, COMPILE_OUT_SUFFIX="", SRCFLAGS...) {
+macro _SRC_c(SRC, COMPILE_OUT_SUFFIX="", SRCFLAGS...) { 
     .CMD=$_SRC_C_CMD
 }
 
@@ -6077,18 +6077,18 @@ macro COMPILE_LUA_21(Src, NAME="") {
     .CMD=$_SRC_lua_21($Src, ${pre=-n :NAME})
 }
 
-GETTEXT_KEEP_PATH=no
-_MO_OUTPUT=
-when ($GETTEXT_KEEP_PATH == "yes") {
-    _MO_OUTPUT=${output;noauto;norel;noext:SRC.mo}
-}
-otherwise {
-    _MO_OUTPUT=${output;noauto;nopath;noext;tobindir:SRC.mo}
-}
-
+GETTEXT_KEEP_PATH=no 
+_MO_OUTPUT= 
+when ($GETTEXT_KEEP_PATH == "yes") { 
+    _MO_OUTPUT=${output;noauto;norel;noext:SRC.mo} 
+} 
+otherwise { 
+    _MO_OUTPUT=${output;noauto;nopath;noext;tobindir:SRC.mo} 
+} 
+ 
 # tag:src-processing
 macro _SRC("po", SRC, SRCFLAGS...) {
-    .CMD=$YMAKE_PYTHON ${input:"contrib/tools/python/src/Tools/i18n/msgfmt.py"} -o $_MO_OUTPUT ${input:SRC}
+    .CMD=$YMAKE_PYTHON ${input:"contrib/tools/python/src/Tools/i18n/msgfmt.py"} -o $_MO_OUTPUT ${input:SRC} 
 }
 
 # tag:ydl-specific
@@ -6168,49 +6168,49 @@ macro SRCS(FILES...) {
 ### @usage SRC_C_SSE2(File Flags...)
 ### Compile single .c-file with SSE2 and extra Flags.
 macro SRC_C_SSE2(FILE, FLAGS...) {
-    _SRC(c $FILE $SSE2_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .sse2)
+    _SRC(c $FILE $SSE2_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .sse2) 
 }
 
 # tag:cpu tag:src-processing
 ### @usage SRC_C_SSE3(File Flags...)
 ### Compile single .c-file with SSE3 and extra Flags.
 macro SRC_C_SSE3(FILE, FLAGS...) {
-    _SRC(c $FILE $SSE3_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .sse3)
+    _SRC(c $FILE $SSE3_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .sse3) 
 }
 
 # tag:cpu tag:src-processing
 ### @usage SRC_C_SSSE3(File Flags...)
 ### Compile single .c-file with SSSE3 and extra Flags.
 macro SRC_C_SSSE3(FILE, FLAGS...) {
-    _SRC(c $FILE $SSSE3_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .ssse3)
+    _SRC(c $FILE $SSSE3_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .ssse3) 
 }
 
 # tag:cpu tag:src-processing
 ### @usage SRC_C_SSE41(File Flags...)
 ### Compile single .c-file with SSE4.1 and extra Flags.
 macro SRC_C_SSE41(FILE, FLAGS...) {
-    _SRC(c $FILE $SSE41_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .sse41)
+    _SRC(c $FILE $SSE41_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .sse41) 
 }
 
 # tag:cpu tag:src-processing
 ### @usage SRC_C_SSE4(File Flags...)
 ### Compile single .c-file with SSE4 (SSE4.1, SSE4.2 and POPCNT) and extra Flags.
 macro SRC_C_SSE4(FILE, FLAGS...) {
-    _SRC(c $FILE $SSE4_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .sse4)
+    _SRC(c $FILE $SSE4_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .sse4) 
 }
 
 # tag:cpu tag:src-processing
 ### @usage SRC_C_AVX(File Flags...)
 ### Compile single .c-file with AVX and extra Flags.
 macro SRC_C_AVX(FILE, FLAGS...) {
-    _SRC(c $FILE $AVX_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .avx)
+    _SRC(c $FILE $AVX_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .avx) 
 }
 
 # tag:cpu tag:src-processing
 ### @usage SRC_C_AVX2(File Flags...)
 ### Compile single .c-file with AVX2 and extra Flags.
 macro SRC_C_AVX2(FILE, FLAGS...) {
-    _SRC(c $FILE $AVX2_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .avx2)
+    _SRC(c $FILE $AVX2_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .avx2) 
 }
 
 # tag:cpu tag:src-processing
@@ -6224,49 +6224,49 @@ macro SRC_CPP_PIC(FILE, FLAGS...) {
 ### @usage SRC_CPP_SSE2(File Flags...)
 ### Compile single .cpp-file with SSE2 and extra Flags.
 macro SRC_CPP_SSE2(FILE, FLAGS...) {
-    _SRC(cpp $FILE $SSE2_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .sse2)
+    _SRC(cpp $FILE $SSE2_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .sse2) 
 }
 
 # tag:cpu tag:src-processing
 ### @usage SRC_CPP_SSE3(File Flags...)
 ### Compile single .cpp-file with SSE3 and extra Flags.
 macro SRC_CPP_SSE3(FILE, FLAGS...) {
-    _SRC(cpp $FILE $SSE3_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .sse3)
+    _SRC(cpp $FILE $SSE3_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .sse3) 
 }
 
 # tag:cpu tag:src-processing
 ### @usage SRC_CPP_SSSE3(File Flags...)
 ### Compile single .cpp-file with SSSE3 and extra Flags.
 macro SRC_CPP_SSSE3(FILE, FLAGS...) {
-    _SRC(cpp $FILE $SSSE3_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .sss3)
+    _SRC(cpp $FILE $SSSE3_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .sss3) 
 }
 
 # tag:cpu tag:src-processing
 ### @usage SRC_CPP_SSE41(File Flags...)
 ### Compile single .cpp-file with SSE4.1 and extra Flags.
 macro SRC_CPP_SSE41(FILE, FLAGS...) {
-    _SRC(cpp $FILE $SSE41_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .sse41)
+    _SRC(cpp $FILE $SSE41_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .sse41) 
 }
 
 # tag:cpu tag:src-processing
 ### @usage SRC_CPP_SSE4(File Flags...)
 ### Compile single .cpp-file with SSE4 (SSE4.1, SSE4.2 and POPCNT) and extra Flags.
 macro SRC_CPP_SSE4(FILE, FLAGS...) {
-    _SRC(cpp $FILE $SSE4_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .sse4)
+    _SRC(cpp $FILE $SSE4_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .sse4) 
 }
 
 # tag:cpu tag:src-processing
 ### @usage SRC_CPP_AVX(File Flags...)
 ### Compile single .cpp-file with AVX and extra Flags.
 macro SRC_CPP_AVX(FILE, FLAGS...) {
-    _SRC(cpp $FILE $AVX_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .avx)
+    _SRC(cpp $FILE $AVX_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .avx) 
 }
 
 # tag:cpu tag:src-processing
 ### @usage SRC_CPP_AVX2(File Flags...)
 ### Compile single .cpp-file with AVX2 and extra Flags.
 macro SRC_CPP_AVX2(FILE, FLAGS...) {
-    _SRC(cpp $FILE $AVX2_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .avx2)
+    _SRC(cpp $FILE $AVX2_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .avx2) 
 }
 
 # tag:python-processing tag:cython
@@ -6275,7 +6275,7 @@ macro SRC_CPP_AVX2(FILE, FLAGS...) {
 ###
 ### Generates .cpp file from .pyx.
 macro BUILDWITH_CYTHON_CPP(Src, Options...) {
-    .CMD=$RUN_CYTHON_SCRIPT $CYTHON_OPTIONS ${Options} --cplus ${CYTHON_CPP_OUTPUT_INCLUDES} ${pre=-I:_CYTHON__INCLUDE} ${input:Src} -o ${output;tobindir:Src.cpp} $CYTHON_OUTPUT_INCLUDES ${requirements;hide:PY_REQUIREMENTS} ${kv;hide:"p CY"} ${kv;hide:"pc yellow"}
+    .CMD=$RUN_CYTHON_SCRIPT $CYTHON_OPTIONS ${Options} --cplus ${CYTHON_CPP_OUTPUT_INCLUDES} ${pre=-I:_CYTHON__INCLUDE} ${input:Src} -o ${output;tobindir:Src.cpp} $CYTHON_OUTPUT_INCLUDES ${requirements;hide:PY_REQUIREMENTS} ${kv;hide:"p CY"} ${kv;hide:"pc yellow"} 
     ADDINCL(FOR cython contrib/tools/cython/Cython/Includes)
 }
 
@@ -6285,7 +6285,7 @@ macro BUILDWITH_CYTHON_CPP(Src, Options...) {
 ### Generates .cpp file from .pyx and attach extra input Dep.
 ### If Dep changes the .cpp file will be re-generated.
 macro _BUILDWITH_CYTHON_CPP_DEP(Src, Dep, Options...) {
-    .CMD=$RUN_CYTHON_SCRIPT $CYTHON_OPTIONS ${Options} --cplus ${CYTHON_CPP_OUTPUT_INCLUDES} ${pre=-I:_CYTHON__INCLUDE} ${input:Src} ${input;hide:Dep} -o ${output;tobindir:Src.cpp} $CYTHON_OUTPUT_INCLUDES ${requirements;hide:PY_REQUIREMENTS} ${kv;hide:"p CY"} ${kv;hide:"pc yellow"}
+    .CMD=$RUN_CYTHON_SCRIPT $CYTHON_OPTIONS ${Options} --cplus ${CYTHON_CPP_OUTPUT_INCLUDES} ${pre=-I:_CYTHON__INCLUDE} ${input:Src} ${input;hide:Dep} -o ${output;tobindir:Src.cpp} $CYTHON_OUTPUT_INCLUDES ${requirements;hide:PY_REQUIREMENTS} ${kv;hide:"p CY"} ${kv;hide:"pc yellow"} 
     ADDINCL(FOR cython contrib/tools/cython/Cython/Includes)
 }
 
@@ -6294,7 +6294,7 @@ macro _BUILDWITH_CYTHON_CPP_DEP(Src, Dep, Options...) {
 ###
 ### Generates .c file from .pyx.
 macro BUILDWITH_CYTHON_C(Src, Options...) {
-    .CMD=$RUN_CYTHON_SCRIPT $CYTHON_OPTIONS ${Options} ${pre=-I:_CYTHON__INCLUDE} ${input:Src} -o ${output;tobindir:Src.c} $CYTHON_OUTPUT_INCLUDES ${requirements;hide:PY_REQUIREMENTS} ${kv;hide:"p CY"} ${kv;hide:"pc yellow"}
+    .CMD=$RUN_CYTHON_SCRIPT $CYTHON_OPTIONS ${Options} ${pre=-I:_CYTHON__INCLUDE} ${input:Src} -o ${output;tobindir:Src.c} $CYTHON_OUTPUT_INCLUDES ${requirements;hide:PY_REQUIREMENTS} ${kv;hide:"p CY"} ${kv;hide:"pc yellow"} 
     ADDINCL(FOR cython contrib/tools/cython/Cython/Includes)
 }
 
@@ -6304,7 +6304,7 @@ macro BUILDWITH_CYTHON_C(Src, Options...) {
 ### Generates .c file from .pyx and attach extra input Dep.
 ### If Dep changes the .c file will be re-generated.
 macro _BUILDWITH_CYTHON_C_DEP(Src, Dep, Options...) {
-    .CMD=$RUN_CYTHON_SCRIPT $CYTHON_OPTIONS ${Options} ${pre=-I:_CYTHON__INCLUDE} ${input:Src} ${input;hide:Dep} -o ${output;tobindir:Src.c} $CYTHON_OUTPUT_INCLUDES ${requirements;hide:PY_REQUIREMENTS} ${kv;hide:"p CY"} ${kv;hide:"pc yellow"}
+    .CMD=$RUN_CYTHON_SCRIPT $CYTHON_OPTIONS ${Options} ${pre=-I:_CYTHON__INCLUDE} ${input:Src} ${input;hide:Dep} -o ${output;tobindir:Src.c} $CYTHON_OUTPUT_INCLUDES ${requirements;hide:PY_REQUIREMENTS} ${kv;hide:"p CY"} ${kv;hide:"pc yellow"} 
     ADDINCL(FOR cython contrib/tools/cython/Cython/Includes)
 }
 
@@ -6313,7 +6313,7 @@ macro _BUILDWITH_CYTHON_C_DEP(Src, Dep, Options...) {
 ###
 ### BUILDWITH_CYTHON_C without .pyx infix and with cdef public .h file.
 macro _BUILDWITH_CYTHON_C_H(Src, Dep, Options...) {
-    .CMD=$RUN_CYTHON_SCRIPT $CYTHON_OPTIONS ${Options} ${pre=-I:_CYTHON__INCLUDE} ${input:Src} ${input;hide:Dep} -o ${output;noext;tobindir:Src.c} ${output;hide;addincl;noext;tobindir:Src.h} $CYTHON_OUTPUT_INCLUDES ${requirements;hide:PY_REQUIREMENTS} ${kv;hide:"p CY"} ${kv;hide:"pc yellow"}
+    .CMD=$RUN_CYTHON_SCRIPT $CYTHON_OPTIONS ${Options} ${pre=-I:_CYTHON__INCLUDE} ${input:Src} ${input;hide:Dep} -o ${output;noext;tobindir:Src.c} ${output;hide;addincl;noext;tobindir:Src.h} $CYTHON_OUTPUT_INCLUDES ${requirements;hide:PY_REQUIREMENTS} ${kv;hide:"p CY"} ${kv;hide:"pc yellow"} 
     ADDINCL(FOR cython contrib/tools/cython/Cython/Includes)
 }
 
@@ -6322,7 +6322,7 @@ macro _BUILDWITH_CYTHON_C_H(Src, Dep, Options...) {
 ###
 ### BUILDWITH_CYTHON_C_H with cdef api _api.h file.
 macro _BUILDWITH_CYTHON_C_API_H(Src, Dep, Options...) {
-    .CMD=$RUN_CYTHON_SCRIPT $CYTHON_OPTIONS ${Options} ${pre=-I:_CYTHON__INCLUDE} ${input:Src} ${input;hide:Dep} -o ${output;noext;tobindir:Src.c} ${output;hide;addincl;noext;tobindir:Src.h} ${output;hide;addincl;noext;defext=_api.h;tobindir:Src} $CYTHON_OUTPUT_INCLUDES ${requirements;hide:PY_REQUIREMENTS} ${kv;hide:"p CY"} ${kv;hide:"pc yellow"}
+    .CMD=$RUN_CYTHON_SCRIPT $CYTHON_OPTIONS ${Options} ${pre=-I:_CYTHON__INCLUDE} ${input:Src} ${input;hide:Dep} -o ${output;noext;tobindir:Src.c} ${output;hide;addincl;noext;tobindir:Src.h} ${output;hide;addincl;noext;defext=_api.h;tobindir:Src} $CYTHON_OUTPUT_INCLUDES ${requirements;hide:PY_REQUIREMENTS} ${kv;hide:"p CY"} ${kv;hide:"pc yellow"} 
     ADDINCL(FOR cython contrib/tools/cython/Cython/Includes)
 }
 
@@ -6460,9 +6460,9 @@ when ($FORCE_VCS_INFO_UPDATE == "yes") {
 GENERATE_VCS_C_INFO_NODEP=$YMAKE_PYTHON ${input:"build/scripts/vcs_info.py"} $(VCS)/vcs.json $VCS_C ${input:"build/scripts/c_templates/svn_interface.c"} $VCS_INFO_DISABLE_CACHE__NO_UID__ && $_SRC_c_nodeps($VCS_C, $VCS_C_OBJ, $(SOURCE_ROOT))
 GENERATE_VCS_GO_INFO_NODEP=$YMAKE_PYTHON ${input:"build/scripts/vcs_info.py"} output-go $(VCS)/vcs.json $VCS_GO $VCS_INFO_DISABLE_CACHE__NO_UID__
 GENERATE_VCS_JAVA_INFO_NODEP=$YMAKE_PYTHON ${input:"build/scripts/vcs_info.py"} output-java $(VCS)/vcs.json $VCS_JAVA $VCS_INFO_DISABLE_CACHE__NO_UID__
-macro UPDATE_VCS_JAVA_INFO_NODEP(Jar) {
-    .CMD=$YMAKE_PYTHON ${input:"build/scripts/vcs_info.py"} output-java $(VCS)/vcs.json $VCS_JAVA $Jar $VCS_INFO_DISABLE_CACHE__NO_UID__
-}
+macro UPDATE_VCS_JAVA_INFO_NODEP(Jar) { 
+    .CMD=$YMAKE_PYTHON ${input:"build/scripts/vcs_info.py"} output-java $(VCS)/vcs.json $VCS_JAVA $Jar $VCS_INFO_DISABLE_CACHE__NO_UID__ 
+} 
 
 ### @usage: CREATE_BUILDINFO_FOR(GenHdr)
 ###
@@ -6498,7 +6498,7 @@ macro CFG_VARS() {
 ### Used implicitly for .in-files processing.
 macro CONFIGURE_FILE(Src, Dst) {
     .CMD=$YMAKE_PYTHON ${input:"build/scripts/configure_file.py"} ${input:Src} ${output;addincl:Dst} $CFG_VARS ${kv;hide:"p CF"} ${kv;hide:"pc yellow"}
-    .SEM=set_vasrs ${CFG_VARS} && configure_file $S/${input;rootrel:Src} $B/${output;rootrel:Dst}
+    .SEM=set_vasrs ${CFG_VARS} && configure_file $S/${input;rootrel:Src} $B/${output;rootrel:Dst} 
 }
 
 ### @usage: BASE_CODEGEN(tool_path prefix)
@@ -6811,7 +6811,7 @@ RELEV_FML_CODEGEN_INCLS=${output_include;hide:"kernel/relevfml/relev_fml.h"} ${o
 ### Documentation: https://wiki.yandex-team.ru/yatool/HowToWriteYaMakeFiles/
 macro GENERATE_ENUM_SERIALIZATION(File) {
     .CMD=$ENUM_PARSER_TOOL ${input:File} --include-path ${input;rootrel:File} --output ${output;chksum;suf=_serialized.cpp:File} ${output_include;hide:File} ${output_include;hide:"util/generic/serialized_enum.h"} ${kv;hide:"p EN"} ${kv;hide:"pc yellow"}
-    .SEM=generate_enum_serilization ${input:File} ${output;hide;suf=_serialized.o:File} INCLUDE_HEADERS ${input;rootrel:File} ${tool;hide:"tools/enum_parser/enum_parser/bin"}
+    .SEM=generate_enum_serilization ${input:File} ${output;hide;suf=_serialized.o:File} INCLUDE_HEADERS ${input;rootrel:File} ${tool;hide:"tools/enum_parser/enum_parser/bin"} 
     PEERDIR(tools/enum_parser/enum_serialization_runtime)
 }
 
@@ -6823,7 +6823,7 @@ macro GENERATE_ENUM_SERIALIZATION(File) {
 ### Documentation: https://wiki.yandex-team.ru/yatool/HowToWriteYaMakeFiles/
 macro GENERATE_ENUM_SERIALIZATION_WITH_HEADER(File) {
     .CMD=$ENUM_PARSER_TOOL ${input:File} --include-path ${input;rootrel:File} --output ${output;chksum;suf=_serialized.cpp:File} --header ${output;chksum;suf=_serialized.h:File} ${output_include;hide:File} ${kv;hide:"p EN"} ${kv;hide:"pc yellow"}
-    .SEM=generate_enum_serilization ${input:File} ${output;hide;suf=_serialized.o:File} GEN_HEADER ${output;suf=_serialized.h:File} INCLUDE_HEADERS ${input;rootrel:File} ${tool;hide:"tools/enum_parser/enum_parser/bin"}
+    .SEM=generate_enum_serilization ${input:File} ${output;hide;suf=_serialized.o:File} GEN_HEADER ${output;suf=_serialized.h:File} INCLUDE_HEADERS ${input;rootrel:File} ${tool;hide:"tools/enum_parser/enum_parser/bin"} 
     PEERDIR(tools/enum_parser/enum_serialization_runtime)
 }
 
@@ -7085,7 +7085,7 @@ macro FROM_MDS(Key, OUT{output}[], OUT_NOAUTO{output}[], OUTPUT_INCLUDES[], FILE
 macro _FROM_EXTERNAL(File, OutFile, OUT{output}[], OUT_NOAUTO{output}[], OUTPUT_INCLUDES[], AUTOUPDATED="", PREFIX=".", RENAME[], EXECUTABLE?"--executable":"", EXT="ext:") {
     .CMD=${hide:SANDBOX_FAKEID} ${cwd:BINDIR} ${resource;pre=$EXT;suf=.external:OutFile} $YMAKE_PYTHON ${input:"build/scripts/fetch_from_external.py"} --external-file ${input:File} --resource-file $(RESOURCE_ROOT)/ext/$OutFile --copy-to-dir $PREFIX ${pre=--rename :RENAME} $EXECUTABLE -- $OUT $OUT_NOAUTO ${input;hide:"build/scripts/fetch_from.py"} ${input;hide:"build/scripts/fetch_from_sandbox.py"} ${input;hide:"build/scripts/fetch_from_mds.py"} ${output_include;hide:OUTPUT_INCLUDES} ${output;hide:OUT} ${output;noauto;hide:OUT_NOAUTO} ${requirements;hide:"network:full"} ${kv;hide:"p XT"} ${kv;hide:"pc yellow"} ${kv;hide:"show_out"}
 
-#FIXME: add '${resource;pre=$EXT:OutFile}' when support of the scheme is added to executors
+#FIXME: add '${resource;pre=$EXT:OutFile}' when support of the scheme is added to executors 
 #FIXME: add 'ADD_CHECK(check.external $File)' when proper testing is implemented
 }
 
@@ -7434,16 +7434,16 @@ otherwise {
     _CPP_PROTO_MODULE_SUFFIX=.a
 }
 
-### @usage: EXPOSE(OutputsToExport...)
-###
-### Allows to mark outputs of macro command as unused in the current module but intended
-### to be used in modules consuming current via PEERDIR.
-###
-### TODO(DEVTOOLS-9000) proper implementation needed
-macro EXPOSE(Args...) {
-    .CMD=$YMAKE_PYTHON ${input:"build/scripts/touch.py"} ${output;suf=$_HASH_HELPER($Args).cpp:"empty_"} ${input;hide:Args}
-}
-
+### @usage: EXPOSE(OutputsToExport...) 
+### 
+### Allows to mark outputs of macro command as unused in the current module but intended 
+### to be used in modules consuming current via PEERDIR. 
+### 
+### TODO(DEVTOOLS-9000) proper implementation needed 
+macro EXPOSE(Args...) { 
+    .CMD=$YMAKE_PYTHON ${input:"build/scripts/touch.py"} ${output;suf=$_HASH_HELPER($Args).cpp:"empty_"} ${input;hide:Args} 
+} 
+ 
 
 # tag:proto
 macro _PROTO_DESC_CMD(File) {
@@ -7455,8 +7455,8 @@ _PROTO_DESC_MERGE_PEERS_CMD=$YMAKE_PYTHON ${input:"build/scripts/merge_files.py"
 
 NEED_GOOGLE_PROTO_PEERDIRS=yes
 
-PROTO_LIBRARY_SEM=$CPP_LIBRARY_SEM && target_proto_plugin cpp_styleguide ${tool:"contrib/tools/protoc/plugins/cpp_styleguide"}
-
+PROTO_LIBRARY_SEM=$CPP_LIBRARY_SEM && target_proto_plugin cpp_styleguide ${tool:"contrib/tools/protoc/plugins/cpp_styleguide"} 
+ 
 # tag:proto
 ### @usage: PROTO_LIBRARY()
 ###
@@ -7477,9 +7477,9 @@ PROTO_LIBRARY_SEM=$CPP_LIBRARY_SEM && target_proto_plugin cpp_styleguide ${tool:
 ### See: [GRPC()](#macro_GRPC), [OPTIMIZE_PY_PROTOS()](#macro_OPTIMIZE_PY_PROTOS), [INCLUDE_TAGS()](#macro_INCLUDE_TAGS), [EXCLUDE_TAGS()](#macro_EXCLUDE_TAGS)
 multimodule PROTO_LIBRARY {
     module CPP_PROTO : LIBRARY {
-        .ALLOWED=EXPOSE
-        # TODO(svidyuk): think about marker which forces semantics inheritance
-        .SEM=PROTO_LIBRARY_SEM
+        .ALLOWED=EXPOSE 
+        # TODO(svidyuk): think about marker which forces semantics inheritance 
+        .SEM=PROTO_LIBRARY_SEM 
         ENABLE(CPP_PROTO)
         ENABLE(GEN_PROTO)
         NO_CLANG_TIDY()
@@ -7501,7 +7501,7 @@ multimodule PROTO_LIBRARY {
     module JAVA_PROTO: EXTERNAL_JAVA_LIBRARY {
         .EXTS=.jsrc
         .ALLOWED=GRPC
-        .SEM=ignored
+        .SEM=ignored 
         SET(PEERDIR_TAGS JAVA_PROTO)
         ENABLE(JAVA_PROTO)
         PEERDIR+=$JAVA_PROTOBUF_PEERS contrib/java/javax/annotation/javax.annotation-api/1.3.1
@@ -7519,7 +7519,7 @@ multimodule PROTO_LIBRARY {
         .ALIASES=SRCS=PY_SRCS
         .ALLOWED=OPTIMIZE_PY_PROTOS NO_OPTIMIZE_PY_PROTOS
         .PEERDIRSELF=CPP_PROTO
-        .SEM=ignored
+        .SEM=ignored 
         SET(PEERDIR_TAGS PY2 PY_PROTO)
         ENABLE(PY_PROTO)
         OPTIMIZE_PY_PROTOS()
@@ -7543,7 +7543,7 @@ multimodule PROTO_LIBRARY {
         .ALIASES=SRCS=PY_SRCS
         .ALLOWED=OPTIMIZE_PY_PROTOS NO_OPTIMIZE_PY_PROTOS
         .PEERDIRSELF=CPP_PROTO
-        .SEM=ignored
+        .SEM=ignored 
         SET(PEERDIR_TAGS PY3 PY3_PROTO)
         ENABLE(PY3_PROTO)
         OPTIMIZE_PY_PROTOS()
@@ -7571,7 +7571,7 @@ multimodule PROTO_LIBRARY {
 
     module GO_PROTO: GO_LIBRARY {
         .IGNORED=GENERATE_ENUM_SERIALIZATION GENERATE_ENUM_SERIALIZATION_WITH_HEADER YMAPS_SPROTO
-        .SEM=ignored
+        .SEM=ignored 
         SET(PEERDIR_TAGS GO GO_PROTO)
         ENABLE(GO_PROTO)
 
@@ -7590,7 +7590,7 @@ multimodule PROTO_LIBRARY {
     module EXT_PROTO: _BARE_UNIT {
         .ALIASES=SRCS=_RAW_PROTO_SRCS
         .CMD=TOUCH_UNIT_MF
-        .SEM=ignored
+        .SEM=ignored 
         .EXTS=.*
         .PROXY=yes
         .PEERDIR_POLICY=as_build_from
@@ -7607,7 +7607,7 @@ multimodule PROTO_LIBRARY {
 
     module DESC_PROTO: _BARE_UNIT {
         .CMD=_PROTO_DESC_MERGE_CMD
-        .SEM=ignored
+        .SEM=ignored 
         .EXTS=.desc
         .NODE_TYPE=Library
         .IGNORED=GENERATE_ENUM_SERIALIZATION GENERATE_ENUM_SERIALIZATION_WITH_HEADER YMAPS_SPROTO RESOURCE GO_PROTO_PLUGIN GRPC
@@ -7637,7 +7637,7 @@ multimodule PROTO_LIBRARY {
     module PB_PY_PROTO: _PY_PACKAGE {
         .INCLUDE_TAG=no
         .PROXY=yes
-        .SEM=ignored
+        .SEM=ignored 
         SET(MODULE_SUFFIX .pb_py.fake.pkg)
         ENABLE(PB_PY_PROTO)
 
@@ -7680,7 +7680,7 @@ macro _RAW_PROTO_SRCS(FILES...) {
     COPY_FILES_TO_BUILD_PREFIX(${ext=.ev:FILES} PREFIX ${_EXT_PROTO_DIR})
 }
 
-module PROTO_DESCRIPTIONS: _BARE_UNIT {
+module PROTO_DESCRIPTIONS: _BARE_UNIT { 
     .CMD=_PROTO_DESC_MERGE_PEERS_CMD
     .PEERDIR_POLICY=as_build_from
     .NODE_TYPE=Library
@@ -7689,10 +7689,10 @@ module PROTO_DESCRIPTIONS: _BARE_UNIT {
 
     SET(PEERDIR_TAGS DESC_PROTO)
     SET(MODULE_SUFFIX .protodesc)
-    SET(MODULE_TYPE PROTO_DESCRIPTIONS)
-}
-
-module PROTO_REGISTRY: PROTO_DESCRIPTIONS {
+    SET(MODULE_TYPE PROTO_DESCRIPTIONS) 
+} 
+ 
+module PROTO_REGISTRY: PROTO_DESCRIPTIONS { 
     SET(MODULE_TYPE PROTO_REGISTRY)
 }
 
@@ -7857,14 +7857,14 @@ module PREBUILT_PROGRAM: _LINK_UNIT {
     }
 }
 
-### @usage COLLECT_JINJA_TEMPLATES(varname path)
-###
-### This macro collects all jinja and yaml files in the directory specified by second argument and
-### stores result in the variable with mane specified by first parameter.
-macro COLLECT_JINJA_TEMPLATES(VAR, DIR) {
-    _GLOB($VAR ${DIR}/**/*.jinja ${DIR}/**/*.yaml)
-}
-
+### @usage COLLECT_JINJA_TEMPLATES(varname path) 
+### 
+### This macro collects all jinja and yaml files in the directory specified by second argument and 
+### stores result in the variable with mane specified by first parameter. 
+macro COLLECT_JINJA_TEMPLATES(VAR, DIR) { 
+    _GLOB($VAR ${DIR}/**/*.jinja ${DIR}/**/*.yaml) 
+} 
+ 
 # tag:go-specific
 GO_HOST_OS=unknown
 when ($HOST_OS_LINUX) {
@@ -8228,8 +8228,8 @@ macro GO_XTEST_EMBED_PATTERN(PATTERN) {
 ###
 ### Define an embed directory DIR.
 macro _GO_EMBED_DIR(XTEST?"_xtest":"", DIR, IMPORT_PATH) {
-    SET(VAR_SALT $XTEST $DIR $IMPORT_PATH)
-    SET(_PATTERN_GLOB uniq_embed_${hash:VAR_SALT})
+    SET(VAR_SALT $XTEST $DIR $IMPORT_PATH) 
+    SET(_PATTERN_GLOB uniq_embed_${hash:VAR_SALT}) 
     _GLOB($_PATTERN_GLOB ${ARCADIA_ROOT}/${IMPORT_PATH}/${DIR}/**/* EXCLUDE ${ARCADIA_ROOT}/${IMPORT_PATH}/${DIR}/**/_* ${ARCADIA_ROOT}/${IMPORT_PATH}/${DIR}/**/.*)
     SET_APPEND(_GO_EMBED_VALUE ++embed$XTEST $DIR \$$_PATTERN_GLOB)
     SET_APPEND(_GO_EMBED_INPUTS \$$_PATTERN_GLOB)
@@ -8372,7 +8372,7 @@ module _GO_BASE_UNIT: _BASE_UNIT {
     .GLOBAL=GO_LDFLAGS
     .PEERDIR_POLICY=as_build_from
     .ALIASES=SRCS=_GO_SRCS RESOURCE=_GO_RESOURCE GO_TEST_SRCS=_GO_UNUSED_SRCS GO_XTEST_SRCS=_GO_UNUSED_SRCS GRPC=_GO_GRPC GO_GRPC_GATEWAY_SRCS=_GO_GRPC_GATEWAY_SRCS GO_GRPC_GATEWAY_SWAGGER_SRCS=_GO_GRPC_GATEWAY_SWAGGER_SRCS CFLAGS=CGO_CFLAGS GO_TEST_EMBED_PATTERN=_GO_UNUSED_SRCS GO_XTEST_EMBED_PATTERN=_GO_UNUSED_SRCS GO_TEST_EMBED_DIR=_GO_UNUSED_SRCS GO_XTEST_EMBED_DIR=_GO_UNUSED_SRCS
-    .ALLOWED=GO_PROTO_PLUGIN USE_CXX USE_UTIL RESOURCE_FILES
+    .ALLOWED=GO_PROTO_PLUGIN USE_CXX USE_UTIL RESOURCE_FILES 
     .IGNORED=GO_SKIP_TESTS USE_SKIFF
 
     ENABLE(_GO_MODULE)
@@ -8665,7 +8665,7 @@ module GO_TEST: GO_PROGRAM {
 
     ADD_YTEST($MODULE_PREFIX$REALPRJNAME go.test)
     ADD_YTEST($MODULE_PREFIX$REALPRJNAME go.bench)
-
+ 
     SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
 }
 
@@ -8789,10 +8789,10 @@ macro PY_EXTRA_LINT_FILES(FILES...) {
 multimodule PY23_LIBRARY {
     module PY2: PY2_LIBRARY {
         OBJ_SUF=.py2
-        RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT
+        RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT 
     }
     module PY3: PY3_LIBRARY {
-        RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT
+        RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT 
         when ($MSVC == "yes" || $CYGWIN == "yes") {
             MODULE_PREFIX=py3
         }
@@ -9020,19 +9020,19 @@ multimodule PY23_TEST {
         MODULE_PREFIX=py2_
         OBJ_SUF=.py2
         CANONIZE_SUB_PATH=py2test
-        RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT
+        RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT 
     }
     module PY3TEST_PROGRAM: PY3TEST_BIN {
         .FINAL_TARGET=yes
         OBJ_SUF=.py3
         CANONIZE_SUB_PATH=py3test
-        RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT
+        RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT 
     }
 
     module PY3TEST_LIBRARY: _PY3_LIBRARY {
         PEERDIR+=library/python/pytest
         _REQUIRE_EXPLICIT_LICENSE()
-        RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT
+        RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT 
     }
 }
 
@@ -9182,21 +9182,21 @@ macro ORIGINAL_SOURCE(Source) {
     ENABLE(UNUSED_MACRO)
 }
 
-CMAKE_PACKAGE=
-CMAKE_PACKAGE_COMPONENT=
-CMAKE_PACKAGE_TARGET=
-CONAN_REFERENCE=
-### @usage: OPENSOURCE_EXPORT_REPLACEMENT(CMAKE PkgName CMAKE_TARGET PkgName::PkgTarget CONAN ConanRef CMAKE_COMPONENT OptCmakePkgComponent)
-###
-### Use specified conan/system pacakcge when exporting cmake build scripts for arcadia C++ project
-### for opensource publication.
-macro OPENSOURCE_EXPORT_REPLACEMENT(CMAKE[], CMAKE_TARGET[], CMAKE_COMPONENET[], CONAN[]) {
-    SET(CMAKE_PACKAGE $CMAKE)
-    SET(CMAKE_PACKAGE_COMPONENT $CMAKE_COMPONENET)
-    SET(CMAKE_LINK_TARGET $CMAKE_TARGET)
-    SET(CONAN_REFERENCE $CONAN)
-}
-
+CMAKE_PACKAGE= 
+CMAKE_PACKAGE_COMPONENT= 
+CMAKE_PACKAGE_TARGET= 
+CONAN_REFERENCE= 
+### @usage: OPENSOURCE_EXPORT_REPLACEMENT(CMAKE PkgName CMAKE_TARGET PkgName::PkgTarget CONAN ConanRef CMAKE_COMPONENT OptCmakePkgComponent) 
+### 
+### Use specified conan/system pacakcge when exporting cmake build scripts for arcadia C++ project 
+### for opensource publication. 
+macro OPENSOURCE_EXPORT_REPLACEMENT(CMAKE[], CMAKE_TARGET[], CMAKE_COMPONENET[], CONAN[]) { 
+    SET(CMAKE_PACKAGE $CMAKE) 
+    SET(CMAKE_PACKAGE_COMPONENT $CMAKE_COMPONENET) 
+    SET(CMAKE_LINK_TARGET $CMAKE_TARGET) 
+    SET(CONAN_REFERENCE $CONAN) 
+} 
+ 
 # tag:licence
 CREDITS_FILE_EXTRA_EXT=
 CREDITS_FLAGS=
diff --git a/build/ymake_conf.py b/build/ymake_conf.py
index 30219eb85e..9f1637881c 100755
--- a/build/ymake_conf.py
+++ b/build/ymake_conf.py
@@ -689,33 +689,33 @@ class YMake(object):
     def __init__(self, arcadia):
         self.arcadia = arcadia
 
-    def print_presets(self):
-        presets = opts().presets
-        if presets and 'YMAKE_JAVA_MODULES' not in presets:
-            if 'YA_IDE_IDEA' in presets or 'MAVEN_EXPORT' in presets:
-                presets['YMAKE_JAVA_MODULES'] = 'no'
-            else:
-                presets['YMAKE_JAVA_MODULES'] = 'yes'
-        if presets and 'YMAKE_JAVA_MODULES' in presets and presets['YMAKE_JAVA_MODULES'] == "yes":
+    def print_presets(self): 
+        presets = opts().presets 
+        if presets and 'YMAKE_JAVA_MODULES' not in presets: 
+            if 'YA_IDE_IDEA' in presets or 'MAVEN_EXPORT' in presets: 
+                presets['YMAKE_JAVA_MODULES'] = 'no' 
+            else: 
+                presets['YMAKE_JAVA_MODULES'] = 'yes' 
+        if presets and 'YMAKE_JAVA_MODULES' in presets and presets['YMAKE_JAVA_MODULES'] == "yes": 
             print('@import "${CONF_ROOT}/conf/java.ymake.conf"')
-        else:
+        else: 
             print('@import "${CONF_ROOT}/conf/jbuild.ymake.conf"')
-
-        if presets:
+ 
+        if presets: 
             print('# Variables set from command line by -D options')
-            for key in sorted(presets):
+            for key in sorted(presets): 
                 if key in ('MY_YMAKE_BIN', 'REAL_YMAKE_BIN'):
                     emit_with_ignore_comment(key, opts().presets[key])
-                elif key == 'YMAKE_JAVA_MODULES':
-                    continue
+                elif key == 'YMAKE_JAVA_MODULES': 
+                    continue 
                 else:
                     emit(key, opts().presets[key])
 
-    @staticmethod
-    def _print_conf_content(path):
-        with open(path, 'r') as fin:
-            print(fin.read())
-
+    @staticmethod 
+    def _print_conf_content(path): 
+        with open(path, 'r') as fin: 
+            print(fin.read()) 
+ 
     def print_core_conf(self):
         emit('YMAKE_YNDEXER_IGNORE_BUILD_ROOT', 'yes')
         print('@import "${CONF_ROOT}/ymake.core.conf"')
@@ -724,17 +724,17 @@ class YMake(object):
         emit_with_ignore_comment('ARCADIA_ROOT', self.arcadia.root)
 
     @staticmethod
-    def _find_conf(conf_file):
+    def _find_conf(conf_file): 
         script_dir = os.path.dirname(__file__)
-        full_path = os.path.join(script_dir, conf_file)
+        full_path = os.path.join(script_dir, conf_file) 
         if os.path.exists(full_path):
             return full_path
         return None
 
-    def _find_core_conf(self):
-        return self._find_conf('ymake.core.conf')
-
+    def _find_core_conf(self): 
+        return self._find_conf('ymake.core.conf') 
 
+ 
 class System(object):
     def __init__(self, platform):
         """
@@ -1919,7 +1919,7 @@ class LD(Linker):
             self.use_stdlib = '-nodefaultlibs'
             self.soname_option = '-install_name'
             if not preset('NO_DEBUGINFO'):
-                self.dwarf_command = '$DWARF_TOOL $TARGET -o ${output;pre=$MODULE_PREFIX$REALPRJNAME.dSYM/Contents/Resources/DWARF/$MODULE_PREFIX:REALPRJNAME}'
+                self.dwarf_command = '$DWARF_TOOL $TARGET -o ${output;pre=$MODULE_PREFIX$REALPRJNAME.dSYM/Contents/Resources/DWARF/$MODULE_PREFIX:REALPRJNAME}' 
 
         if self.target.is_ios and preset('MAPSMOBI_BUILD_TARGET') and self.target.is_arm:
             self.ld_flags.extend(('-fembed-bitcode', '-Wl,-bitcode_verify'))