diff --git a/gradle.properties b/gradle.properties
index e5c43d45..df7e52d0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,7 +20,7 @@ apacheHttpClientVersion = 5.2.3
 aesyDatasizeVersion = 1.0.0
 bytebuddyVersion = 1.14.11
 
-sharedLibsRef = feature/max-retries-EPMDJ-10975
+sharedLibsRef = main
 sharedLibsLocalPath = lib-jvm-shared
 nativeAgentLibName = drill-agent
 nativeAgentHookEnabled = false
diff --git a/test2code/src/main/kotlin/com/epam/drill/agent/test2code/Test2Code.kt b/test2code/src/main/kotlin/com/epam/drill/agent/test2code/Test2Code.kt
index d543f24c..28badfc6 100644
--- a/test2code/src/main/kotlin/com/epam/drill/agent/test2code/Test2Code.kt
+++ b/test2code/src/main/kotlin/com/epam/drill/agent/test2code/Test2Code.kt
@@ -91,7 +91,7 @@ class Test2Code(
     override fun processServerRequest() {
         val sessionId = context()
         val testId = context[DRILL_TEST_ID_HEADER]
-        if (sessionId == null || testId == null) return
+        if (sessionId == null && testId == null) return
         coverageManager.startRecording(sessionId, testId)
     }
 
@@ -102,7 +102,7 @@ class Test2Code(
     override fun processServerResponse() {
         val sessionId = context()
         val testId = context[DRILL_TEST_ID_HEADER]
-        if (sessionId == null || testId == null) return
+        if (sessionId == null && testId == null) return
         coverageManager.stopRecording(sessionId, testId)
     }
 
diff --git a/test2code/src/main/kotlin/com/epam/drill/agent/test2code/coverage/CoverageRecorder.kt b/test2code/src/main/kotlin/com/epam/drill/agent/test2code/coverage/CoverageRecorder.kt
index dea485bd..50d54022 100644
--- a/test2code/src/main/kotlin/com/epam/drill/agent/test2code/coverage/CoverageRecorder.kt
+++ b/test2code/src/main/kotlin/com/epam/drill/agent/test2code/coverage/CoverageRecorder.kt
@@ -16,8 +16,8 @@
 package com.epam.drill.agent.test2code.coverage
 
 interface ICoverageRecorder {
-    fun startRecording(sessionId: String, testId: String)
-    fun stopRecording(sessionId: String, testId: String)
+    fun startRecording(sessionId: String?, testId: String?)
+    fun stopRecording(sessionId: String?, testId: String?)
     fun getContext(): ContextCoverage?
     fun pollRecorded(): Sequence<ExecDatum>
 }
diff --git a/test2code/src/main/kotlin/com/epam/drill/agent/test2code/coverage/CoverageSender.kt b/test2code/src/main/kotlin/com/epam/drill/agent/test2code/coverage/CoverageSender.kt
index eae2fc23..f4e5a8c5 100644
--- a/test2code/src/main/kotlin/com/epam/drill/agent/test2code/coverage/CoverageSender.kt
+++ b/test2code/src/main/kotlin/com/epam/drill/agent/test2code/coverage/CoverageSender.kt
@@ -69,7 +69,12 @@ class IntervalCoverageSender(
      * @features Coverage data sending
      */
     private fun sendProbes(dataToSend: Sequence<ExecDatum>) {
-        dataToSend.map { ClassCoverage(classname = it.name, testId = it.testId, probes = it.probes.values.toBitSet()) }
+        dataToSend
+            .map { ClassCoverage(
+                classname = it.name,
+                testId = it.testId,
+                testSessionId = it.sessionId,
+                probes = it.probes.values.toBitSet()) }
             .chunked(pageSize)
             .forEach { sender.send(destination, CoveragePayload(groupId, appId, instanceId, it)) }
     }
diff --git a/test2code/src/main/kotlin/com/epam/drill/agent/test2code/coverage/GlobalCoverageRecorder.kt b/test2code/src/main/kotlin/com/epam/drill/agent/test2code/coverage/GlobalCoverageRecorder.kt
index 96128f9d..123d1c01 100644
--- a/test2code/src/main/kotlin/com/epam/drill/agent/test2code/coverage/GlobalCoverageRecorder.kt
+++ b/test2code/src/main/kotlin/com/epam/drill/agent/test2code/coverage/GlobalCoverageRecorder.kt
@@ -21,11 +21,11 @@ class GlobalCoverageRecorder: ICoverageRecorder {
     private val globalExecData: ExecData = ExecData()
     private val sentGlobalExecData: ExecData = ExecData()
 
-    override fun startRecording(sessionId: String, testId: String) {
+    override fun startRecording(sessionId: String?, testId: String?) {
         // do nothing
     }
 
-    override fun stopRecording(sessionId: String, testId: String) {
+    override fun stopRecording(sessionId: String?, testId: String?) {
         // do nothing
     }
 
diff --git a/test2code/src/main/kotlin/com/epam/drill/agent/test2code/coverage/ThreadCoverageRecorder.kt b/test2code/src/main/kotlin/com/epam/drill/agent/test2code/coverage/ThreadCoverageRecorder.kt
index 9cd9ecb6..0cc892dd 100644
--- a/test2code/src/main/kotlin/com/epam/drill/agent/test2code/coverage/ThreadCoverageRecorder.kt
+++ b/test2code/src/main/kotlin/com/epam/drill/agent/test2code/coverage/ThreadCoverageRecorder.kt
@@ -24,7 +24,7 @@ class ThreadCoverageRecorder(
     private val context: ThreadLocal<ContextKey?> = ThreadLocal()
     private val execData: ThreadLocal<ExecData?> = ThreadLocal()
 
-    override fun startRecording(sessionId: String, testId: String) {
+    override fun startRecording(sessionId: String?, testId: String?) {
         val ctx = ContextKey(sessionId, testId)
         context.set(ctx)
         execData.set(execDataPool.getOrPut(
@@ -34,7 +34,7 @@ class ThreadCoverageRecorder(
         logger.trace { "Test recording started (sessionId = $sessionId, testId = $testId, threadId = ${Thread.currentThread().id})." }
     }
 
-    override fun stopRecording(sessionId: String, testId: String) {
+    override fun stopRecording(sessionId: String?, testId: String?) {
         execDataPool.release(ContextKey(sessionId, testId), execData.get() ?: ExecData())
         execData.remove()
         context.remove()