diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CMakeLists.txt
index 560451a6d..ee1ba2fb6 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CMakeLists.txt
@@ -39,6 +39,7 @@ NGL_TARGET_LINK_LIBRARIES(codegen_base
 NGL_TARGET_INCLUDE_DIRECTORIES(codegen_base
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
+    ${CMAKE_CURRENT_BINARY_DIR}
 )
 # If RTI target is available, propagate its include dirs/compile defs
 if (TARGET RTI::nddscpp2)
diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/CMakeLists.txt
index 30228d3a4..72db2a25c 100755
--- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/CMakeLists.txt
@@ -9,7 +9,7 @@ IF (NOT BUILD_RPM AND NOT RELEASE_BUILD)
 ENDIF()
 
 #ADD_SUBDIRECTORY(Spu)
-IF (BUILD_WLS)
+IF (BUILD_WLS AND NOT RELEASE_BUILD)
     ADD_SUBDIRECTORY(WlsTetra)
 ELSE()
    ADD_SUBDIRECTORY(TetraJson)
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CMakeLists.txt
index 60762794e..63e413648 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/CoPrtCnv/CMakeLists.txt
@@ -35,4 +35,6 @@ NGL_TARGET_INCLUDE_DIRECTORIES(CoPrtCnv
   INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/../PrtCnv
+    ${CMAKE_CURRENT_BINARY_DIR}/../PrtCnv
 )
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewField.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewField.cpp
index 8e8eda8b9..5c9d87098 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewField.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewField.cpp
@@ -22,7 +22,8 @@ namespace N_LogView
 
 
 LogViewField::LogViewField(const QString& a_name, const E_FieldKind a_kind, const LogViewXdrElement* a_xdrElement)
-  : m_Name(a_name),
+  : m_logger(getLogger("LogViewField")),
+    m_Name(a_name),
     m_IsRightAligned(false),
     m_Offset(0),
     m_Size(0),
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewField.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewField.hpp
index c776bc3e7..51c1dfdfc 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewField.hpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewField.hpp
@@ -113,6 +113,8 @@ namespace N_LogView
 
   protected:
 
+    Logger& m_logger;
+
     QString m_Name;
     QString m_type;
     QStringList m_ValueList;
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.cpp
index 5113527c5..3f0055b84 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.cpp
@@ -72,6 +72,7 @@ LogViewGui::LogViewGui(QWidget* a_parent)
   , m_InjectionThread(nullptr)
   , m_replayTimer(new QTimer(this))
   , m_currentReplayRow(-1)
+  , m_logger(getLogger("LogViewGui"))
 {
   setWindowIcon(QIcon(QLatin1String(":icons/16x16/rde_16x16.png")));
 
@@ -655,10 +656,10 @@ void LogViewGui::updateLogfile()
 
       QString filePath(fileInfo.absolutePath() + QLatin1Char('/'));
       const QString baseName = fileInfo.baseName();
-      const QVector<QStringView> parts = baseName.splitView(QLatin1Char('_'));
+      const QVector<QString> parts = baseName.split(QLatin1Char('_'));
 
       for (int iterator = 0; iterator < parts.size() - 2; ++iterator) 
-        filePath += parts.at(iterator).toString() + QLatin1Char('_');
+        filePath += parts.at(iterator) + QLatin1Char('_');
 
       QString nextFile(filePath + nextDate + QLatin1Char('.') + fileInfo.completeSuffix());
       QString checkFile(filePath + checkDate + QLatin1Char('.') + fileInfo.completeSuffix());
@@ -912,9 +913,9 @@ void LogViewGui::startInjectionThread()
   settings.beginGroup(QLatin1String("LogFiles"));
   QString filePath = settings.value(QLatin1String("Dir")).toString();
   QString exerciseName;
-  QVector<QStringView> parts = filePath.splitView(QLatin1Char('/'));
+  QVector<QString> parts = filePath.split(QLatin1Char('/'));
   if (parts.size() >= 2)
-    exerciseName = QLatin1Char('_') + parts.at(parts.size() - 2).toString();
+    exerciseName = QLatin1Char('_') + parts.at(parts.size() - 2);
 
   QString portFilePath = QCoreApplication::applicationDirPath() + QDir::separator() + QLatin1String("PrtCnv") + exerciseName + QLatin1String(".dat");
   QFileInfo checkPortFile(portFilePath);
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.hpp
index 8aa778097..88901a404 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.hpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewGui.hpp
@@ -180,6 +180,9 @@ protected slots:
 
   void onLogTelegramViewDoubleClicked(const QModelIndex &index);
 
+private:
+  NGL::INGLLogger &m_logger;
+
 private slots:
   void onSettingsChanged(uint32_t changedFlags);
 };
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewInjectionThread.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewInjectionThread.cpp
index 494ebb53a..673903d79 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewInjectionThread.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewInjectionThread.cpp
@@ -24,7 +24,8 @@
 namespace N_LogView
 {
 LogViewInjectionThread::LogViewInjectionThread()
-  : m_DoStartConnection(false)
+  : m_logger(getLogger("LogViewInjectionThread"))
+  , m_DoStartConnection(false)
   , m_SendingPossible(false)
   , m_Socket(nullptr)
   , m_Timer(nullptr)
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewInjectionThread.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewInjectionThread.hpp
index 5e11a854e..235d10f47 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewInjectionThread.hpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewInjectionThread.hpp
@@ -45,6 +45,7 @@ namespace N_LogView
 
   protected:
 
+    Logger& m_logger;
     bool m_DoStartConnection;
     bool m_SendingPossible;
     QString m_Hostname;
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewModels.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewModels.cpp
index 26e266b31..7ba669ece 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewModels.cpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewModels.cpp
@@ -55,7 +55,7 @@ QVariant ParticipantModel::data(const QModelIndex &index, int role) const
         break;
       }
     }
-    if (role == Qt::BackgroundColorRole)
+    if (role == Qt::BackgroundRole)
     {
       if (p.first == 0)
         return QVariant();  
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewModels.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewModels.hpp
index 3a8c0b05e..3e0419915 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewModels.hpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewModels.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <QtGui/QAbstractTableModel>
+#include <QtCore/QAbstractTableModel>
 #include <QtCore/QSharedPointer>
 #include <QtCore/QSortFilterProxyModel>
 #include <set>
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.hpp
index aff434734..0777fe3a2 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.hpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "LogViewTelegram.hpp"
-#include <QtGui/QModelIndex>
+#include <QtCore/QModelIndex>
 
 class QAction;
 class QTableView;
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.hpp
index ff5e25ee6..eed139418 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.hpp
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.hpp
@@ -85,5 +85,6 @@ private:
   QHash<QString, StructInformation> m_structs;
   QHash<QString, PodInformation> m_pods;
   QHash<int, QString> m_visibleTelegrams;
+  NGL::INGLLogger &m_logger;
 };
 } 
diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/CMakeLists.txt
index b697ff081..6d92c507f 100644
--- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/CMakeLists.txt
@@ -6,8 +6,10 @@
 
 
 #ADD_SUBDIRECTORY(TetraTestServer)
-ADD_SUBDIRECTORY(LastTest)
-ADD_SUBDIRECTORY(LastTestAuswertung)
+IF(NOT RELEASE_BUILD)
+  ADD_SUBDIRECTORY(LastTest)
+  ADD_SUBDIRECTORY(LastTestAuswertung)
+ENDIF()
 
 SET(PrtCnv_SRCS
   logger.h
@@ -63,6 +65,7 @@ NGL_TARGET_LINK_LIBRARIES(PrtCnvLib
 )
 NGL_TARGET_INCLUDE_DIRECTORIES(PrtCnvLib
   PUBLIC
+    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/../
 )
 
diff --git a/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt
index 8f98c3afa..e0b242035 100644
--- a/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt
+++ b/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt
@@ -209,6 +209,8 @@ if(BUILD_TESTING)
             return()
         endif()
 
+        # Skip tests in release scope builds
+        if(NOT RELEASE_BUILD)
         add_executable(migration_tests ${EXISTING_SOURCES})
 
         # FLM/FLT tests include build-tree generated headers (flm_[dtc|ftc|enums],
@@ -457,6 +459,7 @@ endif()
         gtest_discover_tests(migration_tests)
         
         message(STATUS "Migration tests enabled: ${EXISTING_SOURCES}")
+        endif() # NOT RELEASE_BUILD
     else()
         message(WARNING "No migration test sources found in ${CMAKE_CURRENT_SOURCE_DIR}")
     endif()