diff --git a/opencl/source/dll/CMakeLists.txt b/opencl/source/dll/CMakeLists.txt
index a847e0f51f..387d7f95fc 100644
--- a/opencl/source/dll/CMakeLists.txt
+++ b/opencl/source/dll/CMakeLists.txt
@@ -48,7 +48,8 @@ append_sources_from_properties(RUNTIME_SRCS_DLL_BASE
 set(RUNTIME_SRCS_DLL_LINUX
     ${NEO_SHARED_DIRECTORY}/dll/linux/debugger_l0_dll_linux.cpp
     ${NEO_SHARED_DIRECTORY}/dll/linux/drm_neo_create.cpp
-    ${NEO_SHARED_DIRECTORY}/dll/linux/options_linux.cpp
+    ${NEO_SHARED_DIRECTORY}/dll/linux${BRANCH_DIR_SUFFIX}/options_linux.cpp
+    ${NEO_SHARED_DIRECTORY}/dll/linux/options_linux.inl
     ${NEO_SHARED_DIRECTORY}/dll/linux/os_interface.cpp
     ${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}devices.inl
     ${NEO_SHARED_DIRECTORY}/dll/devices/devices_base.inl
@@ -58,7 +59,8 @@ set(RUNTIME_SRCS_DLL_LINUX
 
 set(RUNTIME_SRCS_DLL_WINDOWS
     ${NEO_SHARED_DIRECTORY}/dll/windows/debugger_l0_windows.cpp
-    ${NEO_SHARED_DIRECTORY}/dll/windows/options_windows.cpp
+    ${NEO_SHARED_DIRECTORY}/dll/windows${BRANCH_DIR_SUFFIX}/options_windows.cpp
+    ${NEO_SHARED_DIRECTORY}/dll/windows/options_windows.inl
     ${NEO_SHARED_DIRECTORY}/dll/windows/os_interface.cpp
     ${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
     ${NEO_SHARED_DIRECTORY}/os_interface/windows/os_memory_virtual_alloc.cpp
diff --git a/opencl/test/unit_test/linux/CMakeLists.txt b/opencl/test/unit_test/linux/CMakeLists.txt
index 40fee719b8..3c07817e0f 100644
--- a/opencl/test/unit_test/linux/CMakeLists.txt
+++ b/opencl/test/unit_test/linux/CMakeLists.txt
@@ -28,6 +28,7 @@ add_executable(igdrcl_${target_name}
                ${NEO_SHARED_DIRECTORY}/dll/direct_submission_controller_enabled.cpp
                ${NEO_SHARED_DIRECTORY}/dll/linux/drm_neo_create.cpp
                ${NEO_SHARED_DIRECTORY}/dll/linux${BRANCH_DIR_SUFFIX}/options_linux.cpp
+               ${NEO_SHARED_DIRECTORY}/dll/linux/options_linux.inl
                ${NEO_SHARED_DIRECTORY}/dll/linux/os_interface.cpp
                ${NEO_SOURCE_DIR}/opencl/source/dll/command_queue_dll.cpp
                ${NEO_SOURCE_DIR}/opencl/source/os_interface/linux/platform_teardown_linux.cpp
diff --git a/opencl/test/unit_test/windows/CMakeLists.txt b/opencl/test/unit_test/windows/CMakeLists.txt
index e72c7fc1a4..85f1e9f6e0 100644
--- a/opencl/test/unit_test/windows/CMakeLists.txt
+++ b/opencl/test/unit_test/windows/CMakeLists.txt
@@ -30,6 +30,7 @@ if(WIN32)
                  ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_wddm.cpp
                  ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/create_wddm_memory_manager.cpp
                  ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows${BRANCH_DIR_SUFFIX}/options.cpp
+                 ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/options.inl
                  ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/setup_external_dependencies_drm_or_wddm.cpp
                  ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/sys_calls.cpp
                  ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/sys_calls_winmm.cpp
diff --git a/shared/offline_compiler/source/CMakeLists.txt b/shared/offline_compiler/source/CMakeLists.txt
index 11a31f9061..dbc97c4b97 100644
--- a/shared/offline_compiler/source/CMakeLists.txt
+++ b/shared/offline_compiler/source/CMakeLists.txt
@@ -145,6 +145,7 @@ if(WIN32)
        ${NEO_SHARED_DIRECTORY}/compiler_interface/windows/compiler_cache_windows.cpp
        ${NEO_SHARED_DIRECTORY}/compiler_interface/windows/os_compiler_cache_helper.cpp
        ${NEO_SHARED_DIRECTORY}/dll/windows${BRANCH_DIR_SUFFIX}/options_windows.cpp
+       ${NEO_SHARED_DIRECTORY}/dll/windows/options_windows.inl
        ${NEO_SHARED_DIRECTORY}/os_interface/windows/os_inc.h
        ${NEO_SHARED_DIRECTORY}/os_interface/windows/os_library_win.cpp
        ${NEO_SHARED_DIRECTORY}/os_interface/windows/os_library_win.h
@@ -159,6 +160,7 @@ else()
        ${NEO_SHARED_DIRECTORY}/compiler_interface/linux/compiler_cache_linux.cpp
        ${NEO_SHARED_DIRECTORY}/compiler_interface/linux/os_compiler_cache_helper.cpp
        ${NEO_SHARED_DIRECTORY}/dll/linux${BRANCH_DIR_SUFFIX}/options_linux.cpp
+       ${NEO_SHARED_DIRECTORY}/dll/linux/options_linux.inl
        ${NEO_SHARED_DIRECTORY}/os_interface/linux/os_inc.h
        ${NEO_SHARED_DIRECTORY}/os_interface/linux/os_library_linux.cpp
        ${NEO_SHARED_DIRECTORY}/os_interface/linux/os_library_linux.h
diff --git a/shared/offline_compiler/source/ocloc_igc_facade.cpp b/shared/offline_compiler/source/ocloc_igc_facade.cpp
index 1f9691e835..424f38d6c4 100644
--- a/shared/offline_compiler/source/ocloc_igc_facade.cpp
+++ b/shared/offline_compiler/source/ocloc_igc_facade.cpp
@@ -39,10 +39,9 @@ int OclocIgcFacade::initialize(const HardwareInfo &hwInfo) {
     }
 
     auto compilerProductHelper = NEO::CompilerProductHelper::create(hwInfo.platform.eProductFamily);
-
     igcLib = loadIgcLibrary(compilerProductHelper ? compilerProductHelper->getCustomIgcLibraryName() : nullptr);
     if (!igcLib) {
-        argHelper->printf("Error! Loading of IGC library has failed! Filename: %s\n", Os::igcDllName);
+        argHelper->printf("Error! Loading of IGC library has failed! Filename: %s\n", (compilerProductHelper && compilerProductHelper->getCustomIgcLibraryName()) ? compilerProductHelper->getCustomIgcLibraryName() : Os::igcDllName);
         return OCLOC_OUT_OF_HOST_MEMORY;
     }
 
diff --git a/shared/test/common/libult/CMakeLists.txt b/shared/test/common/libult/CMakeLists.txt
index 64cdfa2173..bc0e54d0eb 100644
--- a/shared/test/common/libult/CMakeLists.txt
+++ b/shared/test/common/libult/CMakeLists.txt
@@ -206,6 +206,7 @@ set(neo_libult_SRCS_LINUX
     ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/linux/drm_memory_manager_fixture.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/linux/drm_neo_create.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/linux${BRANCH_DIR_SUFFIX}/options.cpp
+    ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/linux/options.inl
     ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/setup_external_dependencies_${DRIVER_MODEL}.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/linux/sys_calls_linux_ult.cpp
 )
@@ -217,6 +218,7 @@ set(neo_libult_SRCS_WINDOWS
     ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_direct_submission_controller_enabled.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/create_wddm_memory_manager.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows${BRANCH_DIR_SUFFIX}/options.cpp
+    ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/options.inl
     ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/setup_external_dependencies_drm_or_wddm.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/sys_calls.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/sys_calls_winmm.cpp