diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff1f1dd57..3f31dded3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### Features
 - Added `extends` information for Type System Item completion results [#892](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/892)
+- Moved project settings to developer specific settings [#935](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/935)
 
 ### `Project Build` enhancements
 - Re-generate the code and `models.jar` before the `Build` -> `Rebuild Project` [#906](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/906)
diff --git a/resources/META-INF/dependencies/com.intellij.idea.plugin.sap.commerce-cockpitng.xml b/resources/META-INF/dependencies/com.intellij.idea.plugin.sap.commerce-cockpitng.xml
index c56515b0b..251c8647f 100644
--- a/resources/META-INF/dependencies/com.intellij.idea.plugin.sap.commerce-cockpitng.xml
+++ b/resources/META-INF/dependencies/com.intellij.idea.plugin.sap.commerce-cockpitng.xml
@@ -1,6 +1,6 @@
 <!--
-  ~ This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
-  ~ Copyright (C) 2019-2023 EPAM Systems <hybrisideaplugin@epam.com> and contributors
+  ~ This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+  ~ Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU Lesser General Public License as
@@ -35,7 +35,7 @@
 
         <completion.contributor language="XML" implementationClass="com.intellij.idea.plugin.hybris.system.cockpitng.codeInsight.completion.CngCompletionContributor"/>
 
-        <projectConfigurable id="hybris.project.cng.settings" parentId="hybris.project.settings"
+        <projectConfigurable id="hybris.project.cng.settings" groupId="hybris.project.settings"
                              nonDefaultProject="true" dynamic="true"
                              bundle="i18n.HybrisBundle" key="hybris.settings.project.cng.title"
                              provider="com.intellij.idea.plugin.hybris.system.cockpitng.settings.CngConfigurableProvider"/>
diff --git a/resources/META-INF/dependencies/com.intellij.idea.plugin.sap.commerce-diagram.xml b/resources/META-INF/dependencies/com.intellij.idea.plugin.sap.commerce-diagram.xml
index 5266b4b03..33ae897c9 100644
--- a/resources/META-INF/dependencies/com.intellij.idea.plugin.sap.commerce-diagram.xml
+++ b/resources/META-INF/dependencies/com.intellij.idea.plugin.sap.commerce-diagram.xml
@@ -1,7 +1,7 @@
 <!--
-  ~ This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+  ~ This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
   ~ Copyright (C) 2014-2016 Alexander Bartash <AlexanderBartash@gmail.com>
-  ~ Copyright (C) 2019-2023 EPAM Systems <hybrisideaplugin@epam.com> and contributors
+  ~ Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU Lesser General Public License as
@@ -45,6 +45,7 @@
         <applicationService serviceImplementation="com.intellij.idea.plugin.hybris.diagram.typeSystem.TSDiagramToolbarActionsProvider"/>
 
         <projectConfigurable id="hybris.project.diagram.ts.settings" parentId="hybris.project.settings" nonDefaultProject="true" dynamic="true"
+                             bundle="i18n.HybrisBundle" key="hybris.settings.project.diagram.ts.title"
                              provider="com.intellij.idea.plugin.hybris.settings.HybrisProjectDiagramTSSettingsConfigurableProvider"/>
 
         <runLineMarkerContributor language="XML" implementationClass="com.intellij.idea.plugin.hybris.diagram.businessProcess.execution.lineMarker.ShowBPDiagramRunLineMarkerContributor"/>
diff --git a/resources/META-INF/plugin-internal.xml b/resources/META-INF/plugin-internal.xml
index 42e3818ec..caf507d07 100644
--- a/resources/META-INF/plugin-internal.xml
+++ b/resources/META-INF/plugin-internal.xml
@@ -31,7 +31,7 @@
         <treeStructureProvider order="first" implementation="com.intellij.idea.plugin.hybris.project.view.HybrisProjectView"/>
 
         <projectViewNodeDecorator order="last" implementation="com.intellij.idea.plugin.hybris.project.view.HybrisProjectViewNodeDecorator"/>
-        
+
         <psi.referenceContributor language="XML" implementation="com.intellij.idea.plugin.hybris.system.cockpitng.psi.contributor.CngReferenceContributor"/>
         <psi.referenceContributor language="XML" implementation="com.intellij.idea.plugin.hybris.system.bean.psi.contributor.BSReferenceContributor"/>
         <psi.referenceContributor language="XML" implementation="com.intellij.idea.plugin.hybris.system.type.psi.contributor.TSReferenceContributor"/>
diff --git a/src/com/intellij/idea/plugin/hybris/flexibleSearch/completion/provider/FxSHybrisColumnCompletionProvider.kt b/src/com/intellij/idea/plugin/hybris/flexibleSearch/completion/provider/FxSHybrisColumnCompletionProvider.kt
index 3f1b3181e..340c7dfa5 100644
--- a/src/com/intellij/idea/plugin/hybris/flexibleSearch/completion/provider/FxSHybrisColumnCompletionProvider.kt
+++ b/src/com/intellij/idea/plugin/hybris/flexibleSearch/completion/provider/FxSHybrisColumnCompletionProvider.kt
@@ -1,6 +1,6 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019 EPAM Systems <hybrisideaplugin@epam.com>
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -21,18 +21,18 @@ package com.intellij.idea.plugin.hybris.flexibleSearch.completion.provider
 import com.intellij.codeInsight.completion.CompletionParameters
 import com.intellij.codeInsight.completion.CompletionProvider
 import com.intellij.codeInsight.completion.CompletionResultSet
+import com.intellij.idea.plugin.hybris.flexibleSearch.FxSUtils
 import com.intellij.idea.plugin.hybris.flexibleSearch.codeInsight.lookup.FxSLookupElementFactory
 import com.intellij.idea.plugin.hybris.flexibleSearch.psi.FlexibleSearchColumnRefExpression
 import com.intellij.idea.plugin.hybris.flexibleSearch.psi.FlexibleSearchResultColumns
-import com.intellij.idea.plugin.hybris.flexibleSearch.FxSUtils
-import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.psi.util.parentOfType
 import com.intellij.util.ProcessingContext
 
 class FxSHybrisColumnCompletionProvider : CompletionProvider<CompletionParameters>() {
     override fun addCompletions(parameters: CompletionParameters, context: ProcessingContext, result: CompletionResultSet) {
-        val fxsSettings = HybrisProjectSettingsComponent.getInstance(parameters.position.project).state.flexibleSearchSettings
+        val fxsSettings = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(parameters.position.project).state.flexibleSearchSettings
         val addComma = FxSUtils.shouldAddCommaAfterExpression(parameters.position, fxsSettings)
 
         val parent = parameters.position.parentOfType<FlexibleSearchColumnRefExpression>()
diff --git a/src/com/intellij/idea/plugin/hybris/flexibleSearch/completion/provider/FxSKeywordsCompletionProvider.kt b/src/com/intellij/idea/plugin/hybris/flexibleSearch/completion/provider/FxSKeywordsCompletionProvider.kt
index 6413c3200..6a11ac071 100644
--- a/src/com/intellij/idea/plugin/hybris/flexibleSearch/completion/provider/FxSKeywordsCompletionProvider.kt
+++ b/src/com/intellij/idea/plugin/hybris/flexibleSearch/completion/provider/FxSKeywordsCompletionProvider.kt
@@ -1,6 +1,6 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019 EPAM Systems <hybrisideaplugin@epam.com>
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -22,13 +22,13 @@ import com.intellij.codeInsight.completion.CompletionParameters
 import com.intellij.codeInsight.completion.CompletionProvider
 import com.intellij.codeInsight.completion.CompletionResultSet
 import com.intellij.idea.plugin.hybris.flexibleSearch.codeInsight.lookup.FxSLookupElementFactory
-import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.util.ProcessingContext
 
 class FxSKeywordsCompletionProvider(private val keywords: Set<String>) : CompletionProvider<CompletionParameters>() {
 
     override fun addCompletions(parameters: CompletionParameters, context: ProcessingContext, result: CompletionResultSet) {
-        val fxsSettings = HybrisProjectSettingsComponent.getInstance(parameters.position.project).state.flexibleSearchSettings
+        val fxsSettings = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(parameters.position.project).state.flexibleSearchSettings
         result.addAllElements(FxSLookupElementFactory.buildKeywords(keywords, fxsSettings))
     }
 }
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/flexibleSearch/completion/provider/FxSRootCompletionProvider.kt b/src/com/intellij/idea/plugin/hybris/flexibleSearch/completion/provider/FxSRootCompletionProvider.kt
index 579ff4058..f10baf811 100644
--- a/src/com/intellij/idea/plugin/hybris/flexibleSearch/completion/provider/FxSRootCompletionProvider.kt
+++ b/src/com/intellij/idea/plugin/hybris/flexibleSearch/completion/provider/FxSRootCompletionProvider.kt
@@ -1,6 +1,6 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019 EPAM Systems <hybrisideaplugin@epam.com>
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -22,7 +22,7 @@ import com.intellij.codeInsight.completion.CompletionParameters
 import com.intellij.codeInsight.completion.CompletionProvider
 import com.intellij.codeInsight.completion.CompletionResultSet
 import com.intellij.idea.plugin.hybris.flexibleSearch.codeInsight.lookup.FxSLookupElementFactory
-import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.psi.PsiErrorElement
 import com.intellij.util.ProcessingContext
 
@@ -32,7 +32,7 @@ class FxSRootCompletionProvider : CompletionProvider<CompletionParameters>() {
         val psiErrorElement = parameters.position.parent as? PsiErrorElement
             ?: return
 
-        val fxsSettings = HybrisProjectSettingsComponent.getInstance(parameters.position.project).state.flexibleSearchSettings
+        val fxsSettings = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(parameters.position.project).state.flexibleSearchSettings
         // FlexibleSearchTokenType.toString()
         when (psiErrorElement.errorDescription.substringBefore(">") + ">") {
             "<statement>" -> result.addAllElements(
diff --git a/src/com/intellij/idea/plugin/hybris/flexibleSearch/completion/provider/FxSTablesAliasCompletionProvider.kt b/src/com/intellij/idea/plugin/hybris/flexibleSearch/completion/provider/FxSTablesAliasCompletionProvider.kt
index ec5a18383..9b346bbd7 100644
--- a/src/com/intellij/idea/plugin/hybris/flexibleSearch/completion/provider/FxSTablesAliasCompletionProvider.kt
+++ b/src/com/intellij/idea/plugin/hybris/flexibleSearch/completion/provider/FxSTablesAliasCompletionProvider.kt
@@ -1,6 +1,6 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019 EPAM Systems <hybrisideaplugin@epam.com>
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -23,13 +23,13 @@ import com.intellij.codeInsight.completion.CompletionProvider
 import com.intellij.codeInsight.completion.CompletionResultSet
 import com.intellij.idea.plugin.hybris.flexibleSearch.codeInsight.lookup.FxSLookupElementFactory
 import com.intellij.idea.plugin.hybris.flexibleSearch.psi.FlexibleSearchTableAliasName
-import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.util.ProcessingContext
 
 class FxSTablesAliasCompletionProvider : CompletionProvider<CompletionParameters>() {
 
     override fun addCompletions(parameters: CompletionParameters, context: ProcessingContext, result: CompletionResultSet) {
-        val fxsSettings = HybrisProjectSettingsComponent.getInstance(parameters.position.project).state.flexibleSearchSettings
+        val fxsSettings = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(parameters.position.project).state.flexibleSearchSettings
 
         if (!fxsSettings.completion.suggestTableAliasNames) return
 
diff --git a/src/com/intellij/idea/plugin/hybris/flexibleSearch/injection/impl/FlexibleSearchToImpexInjectorProvider.kt b/src/com/intellij/idea/plugin/hybris/flexibleSearch/injection/impl/FlexibleSearchToImpexInjectorProvider.kt
index 74668e374..4c0c37678 100644
--- a/src/com/intellij/idea/plugin/hybris/flexibleSearch/injection/impl/FlexibleSearchToImpexInjectorProvider.kt
+++ b/src/com/intellij/idea/plugin/hybris/flexibleSearch/injection/impl/FlexibleSearchToImpexInjectorProvider.kt
@@ -1,6 +1,6 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019-2023 EPAM Systems <hybrisideaplugin@epam.com> and contributors
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -27,7 +27,7 @@ import com.intellij.idea.plugin.hybris.impex.psi.ImpexString
 import com.intellij.idea.plugin.hybris.impex.psi.ImpexValueGroup
 import com.intellij.idea.plugin.hybris.impex.psi.ImpexValueLine
 import com.intellij.idea.plugin.hybris.lang.injection.impl.AbstractLanguageInjectorProvider
-import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.lang.Language
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.Service
@@ -98,7 +98,7 @@ class FlexibleSearchToImpexInjectorProvider : AbstractLanguageInjectorProvider(F
             ?.computeValue()
             ?: return injectSimple(injectionPlacesRegistrar, host, expression)
 
-        val alias = HybrisProjectSettingsComponent.getInstance(host.project)
+        val alias = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(host.project)
             .state
             .flexibleSearchSettings
             .fallbackToTableNameIfNoAliasProvided
diff --git a/src/com/intellij/idea/plugin/hybris/flexibleSearch/lang/documentation/FlexibleSearchDocumentationTargetProvider.kt b/src/com/intellij/idea/plugin/hybris/flexibleSearch/lang/documentation/FlexibleSearchDocumentationTargetProvider.kt
index 612f65bfc..df432bd71 100644
--- a/src/com/intellij/idea/plugin/hybris/flexibleSearch/lang/documentation/FlexibleSearchDocumentationTargetProvider.kt
+++ b/src/com/intellij/idea/plugin/hybris/flexibleSearch/lang/documentation/FlexibleSearchDocumentationTargetProvider.kt
@@ -1,6 +1,6 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2023 EPAM Systems <hybrisideaplugin@epam.com>
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -21,6 +21,7 @@ package com.intellij.idea.plugin.hybris.flexibleSearch.lang.documentation
 import com.intellij.idea.plugin.hybris.flexibleSearch.file.FlexibleSearchFile
 import com.intellij.idea.plugin.hybris.flexibleSearch.psi.FlexibleSearchDefinedTableName
 import com.intellij.idea.plugin.hybris.flexibleSearch.psi.FlexibleSearchTypes
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
 import com.intellij.platform.backend.documentation.DocumentationTarget
 import com.intellij.platform.backend.documentation.DocumentationTargetProvider
@@ -34,11 +35,13 @@ class FlexibleSearchDocumentationTargetProvider : DocumentationTargetProvider {
         if (file !is FlexibleSearchFile) return emptyList()
 
         val element = file.findElementAt(offset) ?: return emptyList()
-        val settingsComponent = HybrisProjectSettingsComponent.getInstance(file.project)
+        val projectSettings = HybrisProjectSettingsComponent.getInstance(file.project)
 
-        if (!settingsComponent.isHybrisProject()) return emptyList()
+        if (!projectSettings.isHybrisProject()) return emptyList()
 
-        val documentationSettings = settingsComponent.state.flexibleSearchSettings.documentation
+        val developerSettings = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(file.project).state
+
+        val documentationSettings = developerSettings.flexibleSearchSettings.documentation
         if (!documentationSettings.enabled) return emptyList()
 
         val allowedElementTypes = with(mutableListOf<IElementType>()) {
diff --git a/src/com/intellij/idea/plugin/hybris/flexibleSearch/lang/folding/FlexibleSearchFoldingBuilder.kt b/src/com/intellij/idea/plugin/hybris/flexibleSearch/lang/folding/FlexibleSearchFoldingBuilder.kt
index 40ae902ca..b7338e032 100644
--- a/src/com/intellij/idea/plugin/hybris/flexibleSearch/lang/folding/FlexibleSearchFoldingBuilder.kt
+++ b/src/com/intellij/idea/plugin/hybris/flexibleSearch/lang/folding/FlexibleSearchFoldingBuilder.kt
@@ -1,6 +1,6 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019-2023 EPAM Systems <hybrisideaplugin@epam.com> and contributors
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -19,7 +19,7 @@ package com.intellij.idea.plugin.hybris.flexibleSearch.lang.folding
 
 import com.intellij.idea.plugin.hybris.flexibleSearch.file.FlexibleSearchFile
 import com.intellij.idea.plugin.hybris.flexibleSearch.psi.*
-import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.lang.ASTNode
 import com.intellij.lang.folding.FoldingBuilderEx
 import com.intellij.lang.folding.FoldingDescriptor
@@ -40,10 +40,8 @@ class FlexibleSearchFoldingBuilder : FoldingBuilderEx(), DumbAware {
     private val filter = FlexibleSearchFoldingBlocksFilter()
 
     override fun buildFoldRegions(root: PsiElement, document: Document, quick: Boolean): Array<FoldingDescriptor> {
-        val foldingSettings = HybrisProjectSettingsComponent.getInstance(root.project).state.flexibleSearchSettings.folding
-        if (!foldingSettings.enabled) {
-            return emptyArray()
-        }
+        val foldingSettings = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(root.project).state.flexibleSearchSettings.folding
+        if (!foldingSettings.enabled) return emptyArray()
 
         return CachedValuesManager.getCachedValue(root) {
             val results = SyntaxTraverser.psiTraverser(root)
@@ -123,7 +121,7 @@ class FlexibleSearchFoldingBuilder : FoldingBuilderEx(), DumbAware {
         ?: FALLBACK_PLACEHOLDER
 
     private fun getColumnPlaceholderText(node: ASTNode, columnNameType: IElementType, tableAliasType: IElementType): String {
-        val fxsSettings = HybrisProjectSettingsComponent.getInstance(node.psi.project).state.flexibleSearchSettings
+        val fxsSettings = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(node.psi.project).state.flexibleSearchSettings
         val columnName = node.findChildByType(columnNameType)
             ?.text
             ?.trim()
diff --git a/src/com/intellij/idea/plugin/hybris/flexibleSearch/psi/reference/FxSColumnNameReference.kt b/src/com/intellij/idea/plugin/hybris/flexibleSearch/psi/reference/FxSColumnNameReference.kt
index 77f19f341..6bf376e7b 100644
--- a/src/com/intellij/idea/plugin/hybris/flexibleSearch/psi/reference/FxSColumnNameReference.kt
+++ b/src/com/intellij/idea/plugin/hybris/flexibleSearch/psi/reference/FxSColumnNameReference.kt
@@ -1,6 +1,6 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019-2023 EPAM Systems <hybrisideaplugin@epam.com> and contributors
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -26,7 +26,7 @@ import com.intellij.idea.plugin.hybris.flexibleSearch.psi.*
 import com.intellij.idea.plugin.hybris.flexibleSearch.psi.reference.result.FxSColumnAliasNameResolveResult
 import com.intellij.idea.plugin.hybris.flexibleSearch.psi.reference.result.FxSYColumnNameResolveResult
 import com.intellij.idea.plugin.hybris.psi.util.PsiUtils
-import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.openapi.util.Key
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
@@ -53,7 +53,7 @@ class FxSColumnNameReference(owner: FlexibleSearchColumnName) : PsiReferenceBase
         ?.resolve()
         ?.parent
         ?.let { fromClause ->
-            val fxsSettings = HybrisProjectSettingsComponent.getInstance(element.project).state.flexibleSearchSettings
+            val fxsSettings = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(element.project).state.flexibleSearchSettings
             val addComma = FxSUtils.shouldAddCommaAfterExpression(element, fxsSettings)
 
             val aliases = findColumnAliasNames(fromClause) { true }
@@ -122,7 +122,7 @@ class FxSColumnNameReference(owner: FlexibleSearchColumnName) : PsiReferenceBase
             .toList()
 
         private fun getAlternativeVariants(element: PsiElement): Array<LookupElementBuilder> {
-            val fxsSettings = HybrisProjectSettingsComponent.getInstance(element.project).state.flexibleSearchSettings
+            val fxsSettings = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(element.project).state.flexibleSearchSettings
 
             val addComma = FxSUtils.shouldAddCommaAfterExpression(element, fxsSettings)
             // only DOT allowed for non [y] columns
diff --git a/src/com/intellij/idea/plugin/hybris/flexibleSearch/psi/reference/FxSYColumnReference.kt b/src/com/intellij/idea/plugin/hybris/flexibleSearch/psi/reference/FxSYColumnReference.kt
index 27cbf5c3e..de2f39774 100644
--- a/src/com/intellij/idea/plugin/hybris/flexibleSearch/psi/reference/FxSYColumnReference.kt
+++ b/src/com/intellij/idea/plugin/hybris/flexibleSearch/psi/reference/FxSYColumnReference.kt
@@ -1,6 +1,6 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019-2023 EPAM Systems <hybrisideaplugin@epam.com> and contributors
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -30,7 +30,7 @@ import com.intellij.idea.plugin.hybris.flexibleSearch.psi.FlexibleSearchTypes
 import com.intellij.idea.plugin.hybris.flexibleSearch.psi.FlexibleSearchYColumnName
 import com.intellij.idea.plugin.hybris.psi.util.PsiTreeUtilExt
 import com.intellij.idea.plugin.hybris.psi.util.PsiUtils
-import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.idea.plugin.hybris.system.type.codeInsight.completion.TSCompletionService
 import com.intellij.idea.plugin.hybris.system.type.meta.TSMetaModelAccess
 import com.intellij.idea.plugin.hybris.system.type.meta.model.TSMetaType
@@ -115,7 +115,7 @@ class FxSYColumnReference(owner: FlexibleSearchYColumnName) : PsiReferenceBase.P
     If cursor placed at the end of the literal, in addition to table aliases, we will add allowed separators
      */
     private fun getSuitablePrefixes(): Array<LookupElementBuilder> {
-        val fxsSettings = HybrisProjectSettingsComponent.getInstance(element.project).state.flexibleSearchSettings
+        val fxsSettings = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(element.project).state.flexibleSearchSettings
         val aliasText = element.text.replace(HybrisConstants.FXS_DUMMY_IDENTIFIER, "")
 
         val separators: Array<LookupElementBuilder> = element.text.substringAfter(HybrisConstants.FXS_DUMMY_IDENTIFIER)
@@ -139,7 +139,7 @@ class FxSYColumnReference(owner: FlexibleSearchYColumnName) : PsiReferenceBase.P
     fun isAliasedReference() = PsiTreeUtilExt
         .getPrevSiblingOfElementType(element, FlexibleSearchTypes.SELECTED_TABLE_NAME) != null
 
-    fun canFallbackToTableName() = HybrisProjectSettingsComponent.getInstance(element.project)
+    fun canFallbackToTableName() = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(element.project)
         .state
         .flexibleSearchSettings
         .fallbackToTableNameIfNoAliasProvided
diff --git a/src/com/intellij/idea/plugin/hybris/flexibleSearch/settings/FlexibleSearchSettingsConfigurableProvider.kt b/src/com/intellij/idea/plugin/hybris/flexibleSearch/settings/FlexibleSearchSettingsConfigurableProvider.kt
index 11f3e86a1..8c562a1d6 100644
--- a/src/com/intellij/idea/plugin/hybris/flexibleSearch/settings/FlexibleSearchSettingsConfigurableProvider.kt
+++ b/src/com/intellij/idea/plugin/hybris/flexibleSearch/settings/FlexibleSearchSettingsConfigurableProvider.kt
@@ -1,6 +1,6 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2023 EPAM Systems <hybrisideaplugin@epam.com>
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -20,6 +20,7 @@ package com.intellij.idea.plugin.hybris.flexibleSearch.settings
 
 import com.intellij.idea.plugin.hybris.common.utils.HybrisI18NBundleUtils.message
 import com.intellij.idea.plugin.hybris.flexibleSearch.ui.FxSReservedWordsCaseEditorNotificationProvider
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
 import com.intellij.idea.plugin.hybris.settings.ReservedWordsCase
 import com.intellij.openapi.options.BoundSearchableConfigurable
@@ -42,7 +43,7 @@ class FlexibleSearchSettingsConfigurableProvider(val project: Project) : Configu
         message("hybris.settings.project.fxs.title"), "hybris.fxs.settings"
     ) {
 
-        private val state = HybrisProjectSettingsComponent.getInstance(project).state.flexibleSearchSettings
+        private val state = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(project).state.flexibleSearchSettings
 
         private lateinit var verifyCaseCheckBox: JCheckBox
 
diff --git a/src/com/intellij/idea/plugin/hybris/flexibleSearch/ui/AbstractFxSEditorNotificationProvider.kt b/src/com/intellij/idea/plugin/hybris/flexibleSearch/ui/AbstractFxSEditorNotificationProvider.kt
index e6fa2e8ca..04ea849f9 100644
--- a/src/com/intellij/idea/plugin/hybris/flexibleSearch/ui/AbstractFxSEditorNotificationProvider.kt
+++ b/src/com/intellij/idea/plugin/hybris/flexibleSearch/ui/AbstractFxSEditorNotificationProvider.kt
@@ -1,6 +1,6 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019-2023 EPAM Systems <hybrisideaplugin@epam.com> and contributors
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -19,6 +19,7 @@ package com.intellij.idea.plugin.hybris.flexibleSearch.ui
 
 import com.intellij.idea.plugin.hybris.flexibleSearch.file.FlexibleSearchFileType
 import com.intellij.idea.plugin.hybris.flexibleSearch.settings.FlexibleSearchSettings
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
 import com.intellij.openapi.fileEditor.FileEditor
 import com.intellij.openapi.fileTypes.FileTypeRegistry
@@ -36,10 +37,12 @@ import javax.swing.JComponent
 abstract class AbstractFxSEditorNotificationProvider : EditorNotificationProvider, DumbAware {
 
     override fun collectNotificationData(project: Project, file: VirtualFile): Function<in FileEditor, out JComponent?>? {
-        val settings = HybrisProjectSettingsComponent.getInstance(project)
-        if (!settings.isHybrisProject()) return null
+        val projectSettings = HybrisProjectSettingsComponent.getInstance(project)
+        if (!projectSettings.isHybrisProject()) return null
         if (!FileTypeRegistry.getInstance().isFileOfType(file, FlexibleSearchFileType)) return null
-        val fxsSettings = settings.state.flexibleSearchSettings
+
+        val developerSettings = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(project).state
+        val fxsSettings = developerSettings.flexibleSearchSettings
         if (!shouldCollect(fxsSettings)) return null
 
         val psiFile = PsiManager.getInstance(project).findFile(file) ?: return null
diff --git a/src/com/intellij/idea/plugin/hybris/groovy/file/GroovyFileToolbarInstaller.kt b/src/com/intellij/idea/plugin/hybris/groovy/file/GroovyFileToolbarInstaller.kt
index a23e9a0a1..9d3fe049c 100644
--- a/src/com/intellij/idea/plugin/hybris/groovy/file/GroovyFileToolbarInstaller.kt
+++ b/src/com/intellij/idea/plugin/hybris/groovy/file/GroovyFileToolbarInstaller.kt
@@ -1,6 +1,6 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019-2023 EPAM Systems <hybrisideaplugin@epam.com> and contributors
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -19,7 +19,7 @@ package com.intellij.idea.plugin.hybris.groovy.file
 
 import com.intellij.idea.plugin.hybris.common.HybrisConstants
 import com.intellij.idea.plugin.hybris.project.utils.PluginCommon
-import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.idea.plugin.hybris.startup.event.AbstractHybrisFileToolbarInstaller
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.editor.ex.EditorEx
@@ -38,7 +38,7 @@ class GroovyFileToolbarInstaller : AbstractHybrisFileToolbarInstaller(
     }
 
     override fun isToolbarEnabled(project: Project, editor: EditorEx): Boolean {
-        val settings = HybrisProjectSettingsComponent.getInstance(project).state
+        val settings = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(project).state
         val file = editor.virtualFile
         val path = file.path
         val isTestFile = path.contains(HybrisConstants.TEST_SRC_DIRECTORY, true)
diff --git a/src/com/intellij/idea/plugin/hybris/groovy/settings/GroovySettingsConfigurableProvider.kt b/src/com/intellij/idea/plugin/hybris/groovy/settings/GroovySettingsConfigurableProvider.kt
index 1c3f8a423..983b4db2f 100644
--- a/src/com/intellij/idea/plugin/hybris/groovy/settings/GroovySettingsConfigurableProvider.kt
+++ b/src/com/intellij/idea/plugin/hybris/groovy/settings/GroovySettingsConfigurableProvider.kt
@@ -1,6 +1,6 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019-2023 EPAM Systems <hybrisideaplugin@epam.com> and contributors
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -21,6 +21,7 @@ package com.intellij.idea.plugin.hybris.groovy.settings
 import com.intellij.idea.plugin.hybris.common.HybrisConstants
 import com.intellij.idea.plugin.hybris.common.utils.HybrisI18NBundleUtils.message
 import com.intellij.idea.plugin.hybris.groovy.file.GroovyFileToolbarInstaller
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
 import com.intellij.openapi.options.BoundSearchableConfigurable
 import com.intellij.openapi.options.ConfigurableProvider
@@ -39,21 +40,21 @@ class GroovySettingsConfigurableProvider(val project: Project) : ConfigurablePro
         message("hybris.settings.project.groovy.title"), "hybris.groovy.settings"
     ) {
 
-        private val state = HybrisProjectSettingsComponent.getInstance(project).state.groovySettings
+        private val developerSettings = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(project).state.groovySettings
         private lateinit var enableActionToolbar: JCheckBox
 
         override fun createPanel() = panel {
             group("Language") {
                 row {
                     enableActionToolbar = checkBox("Enable actions toolbar for each Groovy file")
-                        .bindSelected(state::enableActionsToolbar)
+                        .bindSelected(developerSettings::enableActionsToolbar)
                         .comment("Actions toolbar enables possibility to change current remote SAP Commerce session and perform operations on current file, such as `Execute on remote server`")
                         .onApply { GroovyFileToolbarInstaller.getInstance()?.toggleToolbarForAllEditors(project) }
                         .component
                 }
                 row {
                     checkBox("Enable actions toolbar for a Test Groovy file")
-                        .bindSelected(state::enableActionsToolbarForGroovyTest)
+                        .bindSelected(developerSettings::enableActionsToolbarForGroovyTest)
                         .comment("Enables Actions toolbar for the groovy files located in the <strong>${HybrisConstants.TEST_SRC_DIRECTORY}</strong> or <strong>${HybrisConstants.GROOVY_TEST_SRC_DIRECTORY}</strong> directory.")
                         .enabledIf(enableActionToolbar.selected)
                         .onApply { GroovyFileToolbarInstaller.getInstance()?.toggleToolbarForAllEditors(project) }
diff --git a/src/com/intellij/idea/plugin/hybris/impex/completion/provider/ImpexHeaderAttributeModifierNameCompletionProvider.kt b/src/com/intellij/idea/plugin/hybris/impex/completion/provider/ImpexHeaderAttributeModifierNameCompletionProvider.kt
index 214db5d42..e5cad9ecb 100644
--- a/src/com/intellij/idea/plugin/hybris/impex/completion/provider/ImpexHeaderAttributeModifierNameCompletionProvider.kt
+++ b/src/com/intellij/idea/plugin/hybris/impex/completion/provider/ImpexHeaderAttributeModifierNameCompletionProvider.kt
@@ -1,7 +1,7 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
  * Copyright (C) 2014-2016 Alexander Bartash <AlexanderBartash@gmail.com>
- * Copyright (C) 2019-2023 EPAM Systems <hybrisideaplugin@epam.com> and contributors
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -23,7 +23,7 @@ import com.intellij.codeInsight.completion.CompletionProvider
 import com.intellij.codeInsight.completion.CompletionResultSet
 import com.intellij.idea.plugin.hybris.impex.codeInsight.lookup.ImpExLookupElementFactory
 import com.intellij.idea.plugin.hybris.impex.constants.modifier.AttributeModifier
-import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.Service
 import com.intellij.util.ProcessingContext
@@ -37,7 +37,7 @@ class ImpexHeaderAttributeModifierNameCompletionProvider : CompletionProvider<Co
         result: CompletionResultSet
     ) {
         val element = parameters.position
-        val completionSettings = HybrisProjectSettingsComponent.getInstance(element.project).state
+        val completionSettings = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(element.project).state
             .impexSettings
             .completion
         AttributeModifier.entries
diff --git a/src/com/intellij/idea/plugin/hybris/impex/completion/provider/ImpexHeaderTypeModifierNameCompletionProvider.kt b/src/com/intellij/idea/plugin/hybris/impex/completion/provider/ImpexHeaderTypeModifierNameCompletionProvider.kt
index 8f37f2054..2fa1bcda6 100644
--- a/src/com/intellij/idea/plugin/hybris/impex/completion/provider/ImpexHeaderTypeModifierNameCompletionProvider.kt
+++ b/src/com/intellij/idea/plugin/hybris/impex/completion/provider/ImpexHeaderTypeModifierNameCompletionProvider.kt
@@ -1,7 +1,7 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
  * Copyright (C) 2014-2016 Alexander Bartash <AlexanderBartash@gmail.com>
- * Copyright (C) 2019-2023 EPAM Systems <hybrisideaplugin@epam.com> and contributors
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -23,7 +23,7 @@ import com.intellij.codeInsight.completion.CompletionProvider
 import com.intellij.codeInsight.completion.CompletionResultSet
 import com.intellij.idea.plugin.hybris.impex.codeInsight.lookup.ImpExLookupElementFactory
 import com.intellij.idea.plugin.hybris.impex.constants.modifier.TypeModifier
-import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.Service
 import com.intellij.util.ProcessingContext
@@ -37,7 +37,7 @@ class ImpexHeaderTypeModifierNameCompletionProvider : CompletionProvider<Complet
         result: CompletionResultSet
     ) {
         val element = parameters.position
-        val completionSettings = HybrisProjectSettingsComponent.getInstance(element.project).state
+        val completionSettings = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(element.project).state
             .impexSettings
             .completion
         TypeModifier.entries
diff --git a/src/com/intellij/idea/plugin/hybris/impex/lang/documentation/ImpexDocumentationTargetProvider.kt b/src/com/intellij/idea/plugin/hybris/impex/lang/documentation/ImpexDocumentationTargetProvider.kt
index 6ac021213..94f6e4ddc 100644
--- a/src/com/intellij/idea/plugin/hybris/impex/lang/documentation/ImpexDocumentationTargetProvider.kt
+++ b/src/com/intellij/idea/plugin/hybris/impex/lang/documentation/ImpexDocumentationTargetProvider.kt
@@ -1,6 +1,6 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2023 EPAM Systems <hybrisideaplugin@epam.com>
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -20,6 +20,7 @@ package com.intellij.idea.plugin.hybris.impex.lang.documentation
 
 import com.intellij.idea.plugin.hybris.impex.psi.ImpexFile
 import com.intellij.idea.plugin.hybris.impex.psi.ImpexTypes
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
 import com.intellij.platform.backend.documentation.DocumentationTarget
 import com.intellij.platform.backend.documentation.DocumentationTargetProvider
@@ -33,11 +34,12 @@ class ImpexDocumentationTargetProvider : DocumentationTargetProvider {
         if (file !is ImpexFile) return emptyList()
 
         val element = file.findElementAt(offset) ?: return emptyList()
-        val settingsComponent = HybrisProjectSettingsComponent.getInstance(file.project)
+        val projectSettings = HybrisProjectSettingsComponent.getInstance(file.project)
 
-        if (!settingsComponent.isHybrisProject()) return emptyList()
+        if (!projectSettings.isHybrisProject()) return emptyList()
 
-        val documentationSettings = settingsComponent.state.impexSettings.documentation
+        val developerSettings = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(file.project).state
+        val documentationSettings = developerSettings.impexSettings.documentation
         if (!documentationSettings.enabled) return emptyList()
 
         val allowedElementTypes = with(mutableListOf<IElementType>()) {
diff --git a/src/com/intellij/idea/plugin/hybris/impex/lang/folding/AbstractImpExFoldingBuilder.kt b/src/com/intellij/idea/plugin/hybris/impex/lang/folding/AbstractImpExFoldingBuilder.kt
index abc7d1169..683cb4337 100644
--- a/src/com/intellij/idea/plugin/hybris/impex/lang/folding/AbstractImpExFoldingBuilder.kt
+++ b/src/com/intellij/idea/plugin/hybris/impex/lang/folding/AbstractImpExFoldingBuilder.kt
@@ -1,6 +1,6 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019-2023 EPAM Systems <hybrisideaplugin@epam.com> and contributors
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -18,7 +18,7 @@
 
 package com.intellij.idea.plugin.hybris.impex.lang.folding
 
-import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.lang.folding.FoldingBuilderEx
 import com.intellij.lang.folding.FoldingDescriptor
 import com.intellij.openapi.editor.Document
@@ -29,7 +29,7 @@ abstract class AbstractImpExFoldingBuilder : FoldingBuilderEx() {
     abstract fun buildFoldRegionsInternal(psi: PsiElement, document: Document, quick: Boolean): Array<FoldingDescriptor>
 
     override fun buildFoldRegions(psi: PsiElement, document: Document, quick: Boolean): Array<FoldingDescriptor> {
-        val foldingEnabled = HybrisProjectSettingsComponent.getInstance(psi.project).getState()
+        val foldingEnabled = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(psi.project).getState()
             .impexSettings
             .folding
             .enabled
diff --git a/src/com/intellij/idea/plugin/hybris/impex/lang/folding/ImpExPsiElementFilterFactory.java b/src/com/intellij/idea/plugin/hybris/impex/lang/folding/ImpExPsiElementFilterFactory.java
index e2917d760..15f99c15c 100644
--- a/src/com/intellij/idea/plugin/hybris/impex/lang/folding/ImpExPsiElementFilterFactory.java
+++ b/src/com/intellij/idea/plugin/hybris/impex/lang/folding/ImpExPsiElementFilterFactory.java
@@ -1,6 +1,6 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019-2023 EPAM Systems <hybrisideaplugin@epam.com> and contributors
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -20,7 +20,7 @@
 
 import com.intellij.idea.plugin.hybris.impex.lang.folding.util.ImpExSimpleFoldingBlocksFilter;
 import com.intellij.idea.plugin.hybris.impex.lang.folding.util.ImpExSmartFoldingBlocksFilter;
-import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent;
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.util.PsiElementFilter;
@@ -39,7 +39,7 @@ public static PsiElementFilter getPsiElementFilter(final @NotNull Project projec
     }
 
     private static boolean isUseSmartFolding(final @NotNull Project project) {
-        return HybrisProjectSettingsComponent.getInstance(project).getState()
+        return HybrisDeveloperSpecificProjectSettingsComponent.getInstance(project).getState()
             .getImpexSettings()
             .getFolding()
             .getUseSmartFolding();
diff --git a/src/com/intellij/idea/plugin/hybris/impex/lang/folding/ImpexFoldingPlaceholderBuilderFactory.kt b/src/com/intellij/idea/plugin/hybris/impex/lang/folding/ImpexFoldingPlaceholderBuilderFactory.kt
index 303f0b958..ec76b1b2e 100644
--- a/src/com/intellij/idea/plugin/hybris/impex/lang/folding/ImpexFoldingPlaceholderBuilderFactory.kt
+++ b/src/com/intellij/idea/plugin/hybris/impex/lang/folding/ImpexFoldingPlaceholderBuilderFactory.kt
@@ -1,6 +1,6 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019-2023 EPAM Systems <hybrisideaplugin@epam.com> and contributors
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -19,7 +19,7 @@ package com.intellij.idea.plugin.hybris.impex.lang.folding
 
 import com.intellij.idea.plugin.hybris.impex.lang.folding.util.ImpExSimpleFoldingPlaceholderBuilder
 import com.intellij.idea.plugin.hybris.impex.lang.folding.util.ImpExSmartFoldingPlaceholderBuilder
-import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.openapi.project.Project
 
 object ImpexFoldingPlaceholderBuilderFactory {
@@ -27,7 +27,7 @@ object ImpexFoldingPlaceholderBuilderFactory {
     fun getPlaceholderBuilder(project: Project) = if (isUseSmartFolding(project)) ImpExSmartFoldingPlaceholderBuilder.getInstance()
     else ImpExSimpleFoldingPlaceholderBuilder.getInstance()
 
-    private fun isUseSmartFolding(project: Project) = HybrisProjectSettingsComponent.getInstance(project).getState()
+    private fun isUseSmartFolding(project: Project) = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(project).getState()
         .impexSettings
         .folding
         .useSmartFolding
diff --git a/src/com/intellij/idea/plugin/hybris/impex/settings/ImpexSettingsConfigurableProvider.kt b/src/com/intellij/idea/plugin/hybris/impex/settings/ImpexSettingsConfigurableProvider.kt
index 180dbf247..16475edec 100644
--- a/src/com/intellij/idea/plugin/hybris/impex/settings/ImpexSettingsConfigurableProvider.kt
+++ b/src/com/intellij/idea/plugin/hybris/impex/settings/ImpexSettingsConfigurableProvider.kt
@@ -19,6 +19,7 @@
 package com.intellij.idea.plugin.hybris.impex.settings
 
 import com.intellij.idea.plugin.hybris.common.utils.HybrisI18NBundleUtils.message
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
 import com.intellij.openapi.options.BoundSearchableConfigurable
 import com.intellij.openapi.options.ConfigurableProvider
@@ -37,7 +38,7 @@ class ImpexSettingsConfigurableProvider(val project: Project) : ConfigurableProv
         message("hybris.settings.project.impex.title"), "hybris.impex.settings"
     ) {
 
-        private val projectSettings = HybrisProjectSettingsComponent.getInstance(project).state.impexSettings
+        private val projectSettings = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(project).state.impexSettings
 
         private lateinit var foldingEnableCheckBox: JCheckBox
         private lateinit var documentationEnableCheckBox: JCheckBox
diff --git a/src/com/intellij/idea/plugin/hybris/jsp/JspPropertyFoldingBuilder.java b/src/com/intellij/idea/plugin/hybris/jsp/JspPropertyFoldingBuilder.java
index 5730b010d..c08add6c3 100644
--- a/src/com/intellij/idea/plugin/hybris/jsp/JspPropertyFoldingBuilder.java
+++ b/src/com/intellij/idea/plugin/hybris/jsp/JspPropertyFoldingBuilder.java
@@ -1,6 +1,6 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019-2023 EPAM Systems <hybrisideaplugin@epam.com> and contributors
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -18,7 +18,7 @@
 
 package com.intellij.idea.plugin.hybris.jsp;
 
-import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent;
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.folding.FoldingBuilderEx;
 import com.intellij.lang.folding.FoldingDescriptor;
@@ -119,7 +119,7 @@ public boolean isCollapsedByDefault(@NotNull final ASTNode node) {
     }
 
     private boolean isFoldingEnabled(final @NotNull Project project) {
-        return HybrisProjectSettingsComponent.getInstance(project).getState()
+        return HybrisDeveloperSpecificProjectSettingsComponent.getInstance(project).getState()
             .getImpexSettings()
             .getFolding()
             .getEnabled();
diff --git a/src/com/intellij/idea/plugin/hybris/polyglotQuery/lang/folding/PolyglotQueryFoldingBuilder.kt b/src/com/intellij/idea/plugin/hybris/polyglotQuery/lang/folding/PolyglotQueryFoldingBuilder.kt
index 67c8ff175..986baf5bd 100644
--- a/src/com/intellij/idea/plugin/hybris/polyglotQuery/lang/folding/PolyglotQueryFoldingBuilder.kt
+++ b/src/com/intellij/idea/plugin/hybris/polyglotQuery/lang/folding/PolyglotQueryFoldingBuilder.kt
@@ -1,6 +1,6 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019-2023 EPAM Systems <hybrisideaplugin@epam.com> and contributors
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -18,7 +18,7 @@
 package com.intellij.idea.plugin.hybris.polyglotQuery.lang.folding
 
 import com.intellij.idea.plugin.hybris.polyglotQuery.psi.PolyglotQueryTypes
-import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.lang.ASTNode
 import com.intellij.lang.folding.FoldingBuilderEx
 import com.intellij.lang.folding.FoldingDescriptor
@@ -37,11 +37,9 @@ class PolyglotQueryFoldingBuilder : FoldingBuilderEx(), DumbAware {
     private val filter = PolyglotQueryFoldingBlocksFilter()
 
     override fun buildFoldRegions(root: PsiElement, document: Document, quick: Boolean): Array<FoldingDescriptor> {
-        val foldingSetting = HybrisProjectSettingsComponent.getInstance(root.project).state.polyglotQuerySettings.folding
+        val foldingSetting = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(root.project).state.polyglotQuerySettings.folding
 
-        if (!foldingSetting.enabled) {
-            return emptyArray()
-        }
+        if (!foldingSetting.enabled) return emptyArray()
 
         return CachedValuesManager.getCachedValue(root) {
             val results = SyntaxTraverser.psiTraverser(root)
@@ -79,7 +77,7 @@ class PolyglotQueryFoldingBuilder : FoldingBuilderEx(), DumbAware {
                 ?.trim()
                 ?: "?"
 
-            if (HybrisProjectSettingsComponent.getInstance(node.psi.project).state.polyglotQuerySettings.folding.showLanguage) {
+            if (HybrisDeveloperSpecificProjectSettingsComponent.getInstance(node.psi.project).state.polyglotQuerySettings.folding.showLanguage) {
                 val language = node.findChildByType(PolyglotQueryTypes.LOCALIZED)
                     ?.let {
                         it.findChildByType(PolyglotQueryTypes.LOCALIZED_NAME)
diff --git a/src/com/intellij/idea/plugin/hybris/polyglotQuery/settings/PolyglotQuerySettingsConfigurableProvider.kt b/src/com/intellij/idea/plugin/hybris/polyglotQuery/settings/PolyglotQuerySettingsConfigurableProvider.kt
index f9463f915..1655667eb 100644
--- a/src/com/intellij/idea/plugin/hybris/polyglotQuery/settings/PolyglotQuerySettingsConfigurableProvider.kt
+++ b/src/com/intellij/idea/plugin/hybris/polyglotQuery/settings/PolyglotQuerySettingsConfigurableProvider.kt
@@ -1,6 +1,6 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019 EPAM Systems <hybrisideaplugin@epam.com>
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -20,6 +20,7 @@ package com.intellij.idea.plugin.hybris.polyglotQuery.settings
 
 import com.intellij.idea.plugin.hybris.common.utils.HybrisI18NBundleUtils.message
 import com.intellij.idea.plugin.hybris.polyglotQuery.ui.PolyglotQueryEditorNotificationProvider
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
 import com.intellij.idea.plugin.hybris.settings.ReservedWordsCase
 import com.intellij.openapi.options.BoundSearchableConfigurable
@@ -45,7 +46,7 @@ class PolyglotQuerySettingsConfigurableProvider(val project: Project) : Configur
         message("hybris.settings.project.pgq.title"), "hybris.pgq.settings"
     ) {
 
-        private val state = HybrisProjectSettingsComponent.getInstance(project).state.polyglotQuerySettings
+        private val state = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(project).state.polyglotQuerySettings
 
         private lateinit var verifyCaseCheckBox: JCheckBox
         private lateinit var foldingEnableCheckBox: JCheckBox
diff --git a/src/com/intellij/idea/plugin/hybris/polyglotQuery/ui/PolyglotQueryEditorNotificationProvider.kt b/src/com/intellij/idea/plugin/hybris/polyglotQuery/ui/PolyglotQueryEditorNotificationProvider.kt
index 9674b73ac..96e42951f 100644
--- a/src/com/intellij/idea/plugin/hybris/polyglotQuery/ui/PolyglotQueryEditorNotificationProvider.kt
+++ b/src/com/intellij/idea/plugin/hybris/polyglotQuery/ui/PolyglotQueryEditorNotificationProvider.kt
@@ -1,6 +1,6 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019-2023 EPAM Systems <hybrisideaplugin@epam.com> and contributors
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -22,6 +22,7 @@ import com.intellij.idea.plugin.hybris.common.utils.HybrisI18NBundleUtils.messag
 import com.intellij.idea.plugin.hybris.common.utils.HybrisIcons
 import com.intellij.idea.plugin.hybris.polyglotQuery.file.PolyglotQueryFileType
 import com.intellij.idea.plugin.hybris.polyglotQuery.settings.PolyglotQuerySettings
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
 import com.intellij.idea.plugin.hybris.settings.ReservedWordsCase
 import com.intellij.openapi.application.ModalityState
@@ -47,10 +48,13 @@ import javax.swing.JComponent
 class PolyglotQueryEditorNotificationProvider : EditorNotificationProvider, DumbAware {
 
     override fun collectNotificationData(project: Project, file: VirtualFile): Function<in FileEditor, out JComponent?>? {
-        val settings = HybrisProjectSettingsComponent.getInstance(project)
-        if (!settings.isHybrisProject()) return null
+        val projectSettings = HybrisProjectSettingsComponent.getInstance(project)
+        if (!projectSettings.isHybrisProject()) return null
         if (!FileTypeRegistry.getInstance().isFileOfType(file, PolyglotQueryFileType)) return null
-        val pgqSettings = settings.state.polyglotQuerySettings
+
+        val developerSettings = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(project).state
+
+        val pgqSettings = developerSettings.polyglotQuerySettings
         if (!pgqSettings.verifyCaseForReservedWords) return null
 
         val psiFile = PsiManager.getInstance(project).findFile(file) ?: return null
diff --git a/src/com/intellij/idea/plugin/hybris/properties/impl/PropertyServiceImpl.kt b/src/com/intellij/idea/plugin/hybris/properties/impl/PropertyServiceImpl.kt
index 92fbb1715..a759b3fbb 100644
--- a/src/com/intellij/idea/plugin/hybris/properties/impl/PropertyServiceImpl.kt
+++ b/src/com/intellij/idea/plugin/hybris/properties/impl/PropertyServiceImpl.kt
@@ -83,8 +83,6 @@ class PropertyServiceImpl(val project: Project) : PropertyService {
             loadHybrisRuntimeProperties(result)
             loadHybrisOptionalConfigDir(result)
 
-            println("Read properties files: ${propertiesFiles.size}")
-
             CachedValueProvider.Result.create(result.values.toList(), propertiesFiles
                 .map { it.virtualFile }
                 .toTypedArray()
diff --git a/src/com/intellij/idea/plugin/hybris/settings/HybrisDeveloperSpecificProjectSettings.kt b/src/com/intellij/idea/plugin/hybris/settings/HybrisDeveloperSpecificProjectSettings.kt
index d572975fd..eceed0ec1 100644
--- a/src/com/intellij/idea/plugin/hybris/settings/HybrisDeveloperSpecificProjectSettings.kt
+++ b/src/com/intellij/idea/plugin/hybris/settings/HybrisDeveloperSpecificProjectSettings.kt
@@ -1,6 +1,6 @@
 /*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019-2023 EPAM Systems <hybrisideaplugin@epam.com> and contributors
+ * This file is part of "SAP Commerce Developers Toolset" plugin for IntelliJ IDEA.
+ * Copyright (C) 2019-2024 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -18,19 +18,28 @@
 
 package com.intellij.idea.plugin.hybris.settings
 
+import com.intellij.idea.plugin.hybris.flexibleSearch.settings.FlexibleSearchSettings
+import com.intellij.idea.plugin.hybris.groovy.settings.GroovySettings
+import com.intellij.idea.plugin.hybris.impex.settings.ImpexSettings
+import com.intellij.idea.plugin.hybris.polyglotQuery.settings.PolyglotQuerySettings
 import com.intellij.idea.plugin.hybris.system.bean.settings.BeanSystemSettings
 import com.intellij.idea.plugin.hybris.system.businessProcess.settings.BpSettings
 import com.intellij.idea.plugin.hybris.system.cockpitng.settings.CngSettings
 import com.intellij.idea.plugin.hybris.system.type.settings.TSDiagramSettings
 import com.intellij.idea.plugin.hybris.system.type.settings.TypeSystemSettings
+import com.intellij.openapi.components.BaseState
 
-data class HybrisDeveloperSpecificProjectSettings(
-    var activeRemoteConnectionID: String? = null,
-    var activeSolrConnectionID: String? = null,
-    var remoteConnectionSettingsList: MutableList<HybrisRemoteConnectionSettings> = mutableListOf(),
-    var typeSystemDiagramSettings: TSDiagramSettings = TSDiagramSettings(),
-    var beanSystemSettings: BeanSystemSettings = BeanSystemSettings(),
-    var typeSystemSettings: TypeSystemSettings = TypeSystemSettings(),
-    var cngSettings: CngSettings = CngSettings(),
-    var bpSettings: BpSettings = BpSettings(),
-)
\ No newline at end of file
+class HybrisDeveloperSpecificProjectSettings : BaseState() {
+    var activeRemoteConnectionID by string(null)
+    var activeSolrConnectionID by string(null)
+    var remoteConnectionSettingsList by list<HybrisRemoteConnectionSettings>()
+    var typeSystemDiagramSettings by property(TSDiagramSettings()) { false }
+    var beanSystemSettings by property(BeanSystemSettings()) { false }
+    var typeSystemSettings by property(TypeSystemSettings()) { false }
+    var cngSettings by property(CngSettings()) { false }
+    var bpSettings by property(BpSettings()) { false }
+    var flexibleSearchSettings by property(FlexibleSearchSettings()) { false }
+    var polyglotQuerySettings by property(PolyglotQuerySettings()) { false }
+    var impexSettings by property(ImpexSettings()) { false }
+    var groovySettings by property(GroovySettings()) { false }
+}
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/settings/HybrisProjectSettings.kt b/src/com/intellij/idea/plugin/hybris/settings/HybrisProjectSettings.kt
index 6b20bfe42..564b2b642 100644
--- a/src/com/intellij/idea/plugin/hybris/settings/HybrisProjectSettings.kt
+++ b/src/com/intellij/idea/plugin/hybris/settings/HybrisProjectSettings.kt
@@ -19,19 +19,10 @@
 package com.intellij.idea.plugin.hybris.settings
 
 import com.intellij.idea.plugin.hybris.facet.ExtensionDescriptor
-import com.intellij.idea.plugin.hybris.flexibleSearch.settings.FlexibleSearchSettings
-import com.intellij.idea.plugin.hybris.groovy.settings.GroovySettings
-import com.intellij.idea.plugin.hybris.impex.settings.ImpexSettings
-import com.intellij.idea.plugin.hybris.polyglotQuery.settings.PolyglotQuerySettings
 import com.intellij.openapi.components.BaseState
 import java.util.*
 
 class HybrisProjectSettings : BaseState() {
-    var flexibleSearchSettings by property(FlexibleSearchSettings()) { false }
-    var polyglotQuerySettings by property(PolyglotQuerySettings()) { false }
-    var impexSettings by property(ImpexSettings()) { false }
-    var groovySettings by property(GroovySettings()) { false }
-
     var customDirectory by string(null)
     var hybrisDirectory by string(null)
     var configDirectory by string(null)
diff --git a/src/com/intellij/idea/plugin/hybris/system/type/codeInsight/completion/TSCompletionService.kt b/src/com/intellij/idea/plugin/hybris/system/type/codeInsight/completion/TSCompletionService.kt
index 25ec6a3f9..4dca1e5a9 100644
--- a/src/com/intellij/idea/plugin/hybris/system/type/codeInsight/completion/TSCompletionService.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/type/codeInsight/completion/TSCompletionService.kt
@@ -27,7 +27,7 @@ import com.intellij.idea.plugin.hybris.common.HybrisConstants.ATTRIBUTE_TARGET
 import com.intellij.idea.plugin.hybris.common.HybrisConstants.ATTRIBUTE_VALUE
 import com.intellij.idea.plugin.hybris.impex.psi.ImpexParameter
 import com.intellij.idea.plugin.hybris.properties.PropertyService
-import com.intellij.idea.plugin.hybris.settings.HybrisProjectSettingsComponent
+import com.intellij.idea.plugin.hybris.settings.HybrisDeveloperSpecificProjectSettingsComponent
 import com.intellij.idea.plugin.hybris.system.type.codeInsight.lookup.TSLookupElementFactory
 import com.intellij.idea.plugin.hybris.system.type.meta.TSMetaModelAccess
 import com.intellij.idea.plugin.hybris.system.type.meta.model.*
@@ -84,7 +84,7 @@ class TSCompletionService(private val project: Project) {
     }
 
     fun getImpexInlineTypeCompletions(project: Project, element: ImpexParameter): List<LookupElement> {
-        val completion = HybrisProjectSettingsComponent.getInstance(project).state.impexSettings.completion
+        val completion = HybrisDeveloperSpecificProjectSettingsComponent.getInstance(project).state.impexSettings.completion
         if (!completion.showInlineTypes) return emptyList()
 
         val referenceItemTypeName = element.referenceItemTypeName ?: return emptyList()