diff --git a/opencl/source/program/program.cpp b/opencl/source/program/program.cpp
index 83d5f2f7ba..65589a73f4 100644
--- a/opencl/source/program/program.cpp
+++ b/opencl/source/program/program.cpp
@@ -9,6 +9,7 @@
 
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/compiler_interface/compiler_options.h"
+#include "shared/source/compiler_interface/compiler_options_extra.h"
 #include "shared/source/compiler_interface/external_functions.h"
 #include "shared/source/compiler_interface/intermediate_representations.h"
 #include "shared/source/debugger/debugger_l0.h"
@@ -107,6 +108,7 @@ std::string Program::getInternalOptions() const {
     CompilerOptions::concatenateAppend(internalOptions, CompilerOptions::preserveVec3Type);
     auto isDebuggerActive = pClDevice->getDevice().getDebugger() != nullptr;
     CompilerOptions::concatenateAppend(internalOptions, compilerProductHelper.getCachingPolicyOptions(isDebuggerActive));
+    CompilerOptions::applyExtraInternalOptions(internalOptions, compilerProductHelper);
     return internalOptions;
 }
 
diff --git a/shared/offline_compiler/source/CMakeLists.txt b/shared/offline_compiler/source/CMakeLists.txt
index 5c05832331..d03d49a2f6 100644
--- a/shared/offline_compiler/source/CMakeLists.txt
+++ b/shared/offline_compiler/source/CMakeLists.txt
@@ -12,6 +12,8 @@ set(OCLOC_FOLDER_NAME "offline_compiler")
 set(CLOC_LIB_SRCS_LIB
     ${NEO_SHARED_DIRECTORY}/compiler_interface/compiler_options.cpp
     ${NEO_SHARED_DIRECTORY}/compiler_interface/compiler_options.h
+    ${NEO_SHARED_DIRECTORY}/compiler_interface/compiler_options_extra.h
+    ${NEO_SHARED_DIRECTORY}/compiler_interface${BRANCH_DIR_SUFFIX}compiler_options_extra.cpp
     ${NEO_SHARED_DIRECTORY}/compiler_interface/compiler_cache.cpp
     ${NEO_SHARED_DIRECTORY}/compiler_interface/compiler_cache.h
     ${NEO_SHARED_DIRECTORY}/compiler_interface/create_main.cpp
diff --git a/shared/offline_compiler/source/offline_compiler.cpp b/shared/offline_compiler/source/offline_compiler.cpp
index f8cf3a4428..95db0a018b 100644
--- a/shared/offline_compiler/source/offline_compiler.cpp
+++ b/shared/offline_compiler/source/offline_compiler.cpp
@@ -14,6 +14,7 @@
 #include "shared/offline_compiler/source/queries.h"
 #include "shared/offline_compiler/source/utilities/get_git_version_info.h"
 #include "shared/source/compiler_interface/compiler_options.h"
+#include "shared/source/compiler_interface/compiler_options_extra.h"
 #include "shared/source/compiler_interface/default_cache_config.h"
 #include "shared/source/compiler_interface/intermediate_representations.h"
 #include "shared/source/compiler_interface/tokenized_string.h"
@@ -897,6 +898,7 @@ void OfflineCompiler::appendExtraInternalOptions(std::string &internalOptions) {
         CompilerOptions::concatenateAppend(internalOptions, CompilerOptions::forceEmuInt32DivRemSP);
     }
     CompilerOptions::concatenateAppend(internalOptions, compilerProductHelper->getCachingPolicyOptions(false));
+    CompilerOptions::applyExtraInternalOptions(internalOptions, *compilerProductHelper);
 }
 
 void OfflineCompiler::parseDebugSettings() {