diff --git a/architects/__manifest__.py b/architects/__manifest__.py
index 4ec8080670..610cd89190 100644
--- a/architects/__manifest__.py
+++ b/architects/__manifest__.py
@@ -42,6 +42,7 @@
         'data/knowledge_tour.xml',
     ],
     'demo': [
+        'demo/res_config_settings.xml',
         'demo/website.xml',
         'demo/res_partner.xml',
         'demo/crm_lead.xml',
diff --git a/architects/demo/res_config_settings.xml b/architects/demo/res_config_settings.xml
new file mode 100644
index 0000000000..93b2d2d36b
--- /dev/null
+++ b/architects/demo/res_config_settings.xml
@@ -0,0 +1,8 @@
+
+
+    
+        
+        
+    
+    
+
diff --git a/base_industry_data/demo/res_config_settings.xml b/base_industry_data/demo/res_config_settings.xml
index 2d567b5204..bb52e88a40 100644
--- a/base_industry_data/demo/res_config_settings.xml
+++ b/base_industry_data/demo/res_config_settings.xml
@@ -1,7 +1,7 @@
 
 
-    
+    
         
     
-    
+    
 
diff --git a/billboard_rental/__manifest__.py b/billboard_rental/__manifest__.py
index d72ad50958..35337351e8 100644
--- a/billboard_rental/__manifest__.py
+++ b/billboard_rental/__manifest__.py
@@ -41,6 +41,7 @@
         'data/knowledge_tour.xml',
     ],
     'demo': [
+        'demo/res_config_settings.xml',
         'demo/website.xml',
         'demo/res_partner.xml',
         'demo/account_analytic_plan.xml',
diff --git a/billboard_rental/demo/res_config_settings.xml b/billboard_rental/demo/res_config_settings.xml
new file mode 100644
index 0000000000..8fb24cd3e9
--- /dev/null
+++ b/billboard_rental/demo/res_config_settings.xml
@@ -0,0 +1,8 @@
+
+
+    
+        
+        
+    
+    
+
diff --git a/certification_organism/__manifest__.py b/certification_organism/__manifest__.py
index c6ed2dc7e1..412db7f49f 100644
--- a/certification_organism/__manifest__.py
+++ b/certification_organism/__manifest__.py
@@ -39,6 +39,7 @@
         'data/knowledge_tour.xml',
     ],
     'demo': [
+        'demo/res_config_settings.xml',
         'demo/website.xml',
         'demo/res_partner.xml',
         'demo/hr_leave.xml',
diff --git a/certification_organism/demo/res_config_settings.xml b/certification_organism/demo/res_config_settings.xml
new file mode 100644
index 0000000000..15cda5498e
--- /dev/null
+++ b/certification_organism/demo/res_config_settings.xml
@@ -0,0 +1,8 @@
+
+
+    
+        
+        
+    
+    
+
diff --git a/cleaning_services/__manifest__.py b/cleaning_services/__manifest__.py
index 7a2be2a3b1..457f971488 100644
--- a/cleaning_services/__manifest__.py
+++ b/cleaning_services/__manifest__.py
@@ -29,6 +29,7 @@
         'data/mail_message.xml',
     ],
     'demo': [
+        'demo/res_config_settings.xml',
         'demo/res_company.xml',
         'demo/res_partner.xml',
         'demo/crm_lead.xml',
diff --git a/cleaning_services/demo/res_config_settings.xml b/cleaning_services/demo/res_config_settings.xml
new file mode 100644
index 0000000000..a18e83641d
--- /dev/null
+++ b/cleaning_services/demo/res_config_settings.xml
@@ -0,0 +1,8 @@
+
+
+    
+        
+        
+    
+    
+
diff --git a/condominium/__manifest__.py b/condominium/__manifest__.py
index 649b5936fe..03500c9bf3 100644
--- a/condominium/__manifest__.py
+++ b/condominium/__manifest__.py
@@ -51,6 +51,7 @@
         'data/knowledge_tour.xml',
     ],
     'demo': [
+        'demo/res_config_settings.xml',
         'demo/res_partner.xml',
         'demo/res_company.xml',
         'demo/x_buildings.xml',
diff --git a/condominium/demo/res_config_settings.xml b/condominium/demo/res_config_settings.xml
new file mode 100644
index 0000000000..dc8f8f62f6
--- /dev/null
+++ b/condominium/demo/res_config_settings.xml
@@ -0,0 +1,8 @@
+
+
+    
+        
+        
+    
+    
+
diff --git a/construction/__manifest__.py b/construction/__manifest__.py
index 46a7b5f398..13a7b908f9 100644
--- a/construction/__manifest__.py
+++ b/construction/__manifest__.py
@@ -35,6 +35,7 @@
         'data/knowledge_tour.xml',
     ],
     'demo': [
+        'demo/res_config_settings.xml',
         'demo/documents_folder.xml',
         'demo/res_partner.xml',
         'demo/account_analytic_account.xml',
diff --git a/construction/demo/res_config_settings.xml b/construction/demo/res_config_settings.xml
new file mode 100644
index 0000000000..1db4bd5f7c
--- /dev/null
+++ b/construction/demo/res_config_settings.xml
@@ -0,0 +1,8 @@
+
+
+    
+        
+        
+    
+    
+
diff --git a/custom_furniture/__manifest__.py b/custom_furniture/__manifest__.py
index 20d7f9baf8..c5f4bd951e 100644
--- a/custom_furniture/__manifest__.py
+++ b/custom_furniture/__manifest__.py
@@ -49,6 +49,7 @@
         'data/knowledge_tour.xml',
     ],
     'demo': [
+        'demo/res_config_settings.xml',
         'demo/res_partner.xml',
         'demo/hr_employee.xml',
         'demo/crm_lead.xml',
diff --git a/custom_furniture/demo/res_config_settings.xml b/custom_furniture/demo/res_config_settings.xml
new file mode 100644
index 0000000000..8c1edef2cb
--- /dev/null
+++ b/custom_furniture/demo/res_config_settings.xml
@@ -0,0 +1,8 @@
+
+
+    
+        
+        
+    
+    
+
diff --git a/electrician/__manifest__.py b/electrician/__manifest__.py
index 32dbe18cb1..8d3ae81351 100644
--- a/electrician/__manifest__.py
+++ b/electrician/__manifest__.py
@@ -33,6 +33,7 @@
         'data/mail_message.xml',
     ],
     'demo': [
+        'demo/res_config_settings.xml',
         'demo/res_partner.xml',
         'demo/crm_lead.xml',
         'demo/hr_department.xml',
diff --git a/electrician/demo/res_config_settings.xml b/electrician/demo/res_config_settings.xml
new file mode 100644
index 0000000000..8270e441ce
--- /dev/null
+++ b/electrician/demo/res_config_settings.xml
@@ -0,0 +1,8 @@
+
+
+    
+        
+        
+    
+    
+
diff --git a/electronic_store/__manifest__.py b/electronic_store/__manifest__.py
index b11be2fb83..f3ef49d700 100644
--- a/electronic_store/__manifest__.py
+++ b/electronic_store/__manifest__.py
@@ -50,6 +50,7 @@
         'data/knowledge_tour.xml',
     ],
     'demo': [
+        'demo/res_config_settings.xml',
         'demo/res_partner.xml',
         'demo/account_analytic_plan.xml',
         'demo/account_analytic_account.xml',
diff --git a/electronic_store/demo/res_config_settings.xml b/electronic_store/demo/res_config_settings.xml
new file mode 100644
index 0000000000..00f5625297
--- /dev/null
+++ b/electronic_store/demo/res_config_settings.xml
@@ -0,0 +1,8 @@
+
+
+    
+        
+        
+    
+    
+
diff --git a/environmental_agency/__manifest__.py b/environmental_agency/__manifest__.py
index 3a0e3c339d..f0b7205fee 100644
--- a/environmental_agency/__manifest__.py
+++ b/environmental_agency/__manifest__.py
@@ -34,6 +34,7 @@
         'data/document_document.xml',
     ],
     'demo': [
+        'demo/res_config_settings.xml',
         'demo/ir_attachment_post.xml',
         'demo/res_company.xml',
         'demo/website.xml',
diff --git a/environmental_agency/demo/res_config_settings.xml b/environmental_agency/demo/res_config_settings.xml
new file mode 100644
index 0000000000..50b5a916ed
--- /dev/null
+++ b/environmental_agency/demo/res_config_settings.xml
@@ -0,0 +1,8 @@
+
+
+    
+        
+        
+    
+    
+
diff --git a/food_trucks/__manifest__.py b/food_trucks/__manifest__.py
index c374f2dc39..ffc9ffc363 100644
--- a/food_trucks/__manifest__.py
+++ b/food_trucks/__manifest__.py
@@ -1,44 +1,45 @@
 {
-  'name': 'Food Trucks',
-  'version': '1.0',
-  'category': 'Hospitality',
-  'author': 'Odoo S.A.',
-  'depends': [
-      'base_industry_data',
-      'industry_fsm_sale',
-      'knowledge',
-      'planning',
-      'pos_restaurant',
-      'sale_crm',
-  ],
-  'data': [
-      'data/crm_tag.xml',
-      'data/pos_payment_method.xml',
-      'data/uom_uom.xml',
-      'data/product_product.xml',
-      'data/restaurant_floor.xml',
-      'data/restaurant_table.xml',
-      'data/knowledge_article.xml',
-      'data/knowledge_article_favorite.xml',
-      'data/mail_message.xml',
-      'data/res_config_settings.xml',
-  ],
-  'demo': [
-      'demo/pos_config.xml',
-      'demo/res_partner.xml',
-      'demo/crm_lead.xml',
-      'demo/hr_department.xml',
-      'demo/hr_employee.xml',
-      'demo/pos_order.xml',
-      'demo/pos_order_line.xml',
-      'demo/sale_order.xml',
-      'demo/sale_order_line.xml',
-      'demo/sale_order_confirm.xml',
-      'demo/project_task.xml',
-  ],
-  "cloc_exclude": [
-      "data/knowledge_article.xml",
-  ],
-  'images': ['images/main.png'],
-  'license': 'OPL-1'
+    'name': 'Food Trucks',
+    'version': '1.0',
+    'category': 'Hospitality',
+    'author': 'Odoo S.A.',
+    'depends': [
+        'base_industry_data',
+        'industry_fsm_sale',
+        'knowledge',
+        'planning',
+        'pos_restaurant',
+        'sale_crm',
+    ],
+    'data': [
+        'data/crm_tag.xml',
+        'data/pos_payment_method.xml',
+        'data/uom_uom.xml',
+        'data/product_product.xml',
+        'data/restaurant_floor.xml',
+        'data/restaurant_table.xml',
+        'data/knowledge_article.xml',
+        'data/knowledge_article_favorite.xml',
+        'data/mail_message.xml',
+        'data/res_config_settings.xml',
+    ],
+    'demo': [
+        'demo/res_config_settings.xml',
+        'demo/pos_config.xml',
+        'demo/res_partner.xml',
+        'demo/crm_lead.xml',
+        'demo/hr_department.xml',
+        'demo/hr_employee.xml',
+        'demo/pos_order.xml',
+        'demo/pos_order_line.xml',
+        'demo/sale_order.xml',
+        'demo/sale_order_line.xml',
+        'demo/sale_order_confirm.xml',
+        'demo/project_task.xml',
+    ],
+    "cloc_exclude": [
+        "data/knowledge_article.xml",
+    ],
+    'images': ['images/main.png'],
+    'license': 'OPL-1'
 }
diff --git a/food_trucks/demo/res_config_settings.xml b/food_trucks/demo/res_config_settings.xml
new file mode 100644
index 0000000000..850c143d76
--- /dev/null
+++ b/food_trucks/demo/res_config_settings.xml
@@ -0,0 +1,8 @@
+
+
+    
+        
+        
+    
+    
+
diff --git a/gardening/__manifest__.py b/gardening/__manifest__.py
index 058f02d943..8e9fb9f52f 100644
--- a/gardening/__manifest__.py
+++ b/gardening/__manifest__.py
@@ -29,6 +29,7 @@
         'data/knowledge_tour.xml',
     ],
     'demo': [
+        'demo/res_config_settings.xml',
         'demo/res_partner.xml',
         'demo/res_user.xml',
         'demo/account_analytic_account.xml',
diff --git a/gardening/demo/res_config_settings.xml b/gardening/demo/res_config_settings.xml
new file mode 100644
index 0000000000..cc0a1458e2
--- /dev/null
+++ b/gardening/demo/res_config_settings.xml
@@ -0,0 +1,8 @@
+
+
+    
+        
+        
+    
+    
+
diff --git a/handyman/__manifest__.py b/handyman/__manifest__.py
index 3af2b33a5f..655f57f3f5 100644
--- a/handyman/__manifest__.py
+++ b/handyman/__manifest__.py
@@ -38,6 +38,7 @@
         'data/sale_order_template_line.xml',
     ],
     'demo': [
+        'demo/res_config_settings.xml',
         'demo/res_partner.xml',
         'demo/crm_lead.xml',
         'demo/mail_activity.xml',
diff --git a/handyman/demo/res_config_settings.xml b/handyman/demo/res_config_settings.xml
new file mode 100644
index 0000000000..7e22b44919
--- /dev/null
+++ b/handyman/demo/res_config_settings.xml
@@ -0,0 +1,8 @@
+
+
+    
+        
+        
+    
+    
+
diff --git a/industry_lawyer/__manifest__.py b/industry_lawyer/__manifest__.py
index 33a3e0a67b..691ed2abe6 100644
--- a/industry_lawyer/__manifest__.py
+++ b/industry_lawyer/__manifest__.py
@@ -33,6 +33,7 @@
         'data/hr_employee_category.xml',
     ],
     'demo': [
+        'demo/res_config_settings.xml',
         'demo/res_partner.xml',
         'demo/crm_lead.xml',
         'demo/mail_activity.xml',
diff --git a/industry_lawyer/demo/res_config_settings.xml b/industry_lawyer/demo/res_config_settings.xml
new file mode 100644
index 0000000000..3f476786da
--- /dev/null
+++ b/industry_lawyer/demo/res_config_settings.xml
@@ -0,0 +1,8 @@
+
+
+    
+        
+        
+    
+    
+
diff --git a/it_hardware/__manifest__.py b/it_hardware/__manifest__.py
index 4bcd70124d..d9136bd8e5 100644
--- a/it_hardware/__manifest__.py
+++ b/it_hardware/__manifest__.py
@@ -45,6 +45,7 @@
         'data/knowledge_tour.xml',
     ],
     'demo': [
+        'demo/res_config_settings.xml',
         'demo/website.xml',
         'demo/res_partner.xml',
         'demo/product_supplierinfo.xml',
diff --git a/it_hardware/demo/res_config_settings.xml b/it_hardware/demo/res_config_settings.xml
new file mode 100644
index 0000000000..a77a671be2
--- /dev/null
+++ b/it_hardware/demo/res_config_settings.xml
@@ -0,0 +1,8 @@
+
+
+    
+        
+        
+    
+    
+
diff --git a/marketing_agency/__manifest__.py b/marketing_agency/__manifest__.py
index 2c1cd493ee..86ee05c673 100644
--- a/marketing_agency/__manifest__.py
+++ b/marketing_agency/__manifest__.py
@@ -47,6 +47,7 @@
         'data/install_apps.xml',
     ],
     'demo': [
+        'demo/res_config_settings.xml',
         'demo/crm_team.xml',
         'demo/res_partner.xml',
         'demo/crm_lead.xml',
diff --git a/marketing_agency/demo/res_config_settings.xml b/marketing_agency/demo/res_config_settings.xml
new file mode 100644
index 0000000000..424a14695f
--- /dev/null
+++ b/marketing_agency/demo/res_config_settings.xml
@@ -0,0 +1,8 @@
+
+
+    
+        
+        
+    
+    
+
diff --git a/odoo_partner/__manifest__.py b/odoo_partner/__manifest__.py
index 10ecac4ee8..6acd56e0ee 100644
--- a/odoo_partner/__manifest__.py
+++ b/odoo_partner/__manifest__.py
@@ -36,6 +36,7 @@
         'data/knowledge_tour.xml',
     ],
     'demo': [
+        'demo/res_config_settings.xml',
         'demo/res_partner.xml',
         'demo/appointment_type.xml',
         'demo/crm_lead.xml',
diff --git a/odoo_partner/demo/res_config_settings.xml b/odoo_partner/demo/res_config_settings.xml
new file mode 100644
index 0000000000..3e38a87065
--- /dev/null
+++ b/odoo_partner/demo/res_config_settings.xml
@@ -0,0 +1,8 @@
+
+
+    
+        
+        
+    
+    
+
diff --git a/personal_trainer/__manifest__.py b/personal_trainer/__manifest__.py
index 819a6bfd8c..52014064b7 100644
--- a/personal_trainer/__manifest__.py
+++ b/personal_trainer/__manifest__.py
@@ -27,6 +27,7 @@
         'data/knowledge_tour.xml',
     ],
     'demo': [
+        'demo/res_config_settings.xml',
         'demo/res_partner.xml',
         'demo/crm_lead.xml',
         'demo/calendar_event.xml',
diff --git a/personal_trainer/demo/res_config_settings.xml b/personal_trainer/demo/res_config_settings.xml
new file mode 100644
index 0000000000..ee6c41a42f
--- /dev/null
+++ b/personal_trainer/demo/res_config_settings.xml
@@ -0,0 +1,8 @@
+
+
+    
+        
+        
+    
+    
+
diff --git a/shoe_maker/__manifest__.py b/shoe_maker/__manifest__.py
index 413e591f6f..e6b7b13d48 100644
--- a/shoe_maker/__manifest__.py
+++ b/shoe_maker/__manifest__.py
@@ -39,6 +39,7 @@
         'data/knowledge_article_favorite.xml',
     ],
     'demo': [
+        'demo/res_config_settings.xml',
         'demo/res_partner.xml',
         'demo/hr_department.xml',
         'demo/hr_employee.xml',
diff --git a/shoe_maker/demo/res_config_settings.xml b/shoe_maker/demo/res_config_settings.xml
new file mode 100644
index 0000000000..207d2eb38b
--- /dev/null
+++ b/shoe_maker/demo/res_config_settings.xml
@@ -0,0 +1,8 @@
+
+
+    
+        
+        
+    
+    
+
diff --git a/software_reseller/__manifest__.py b/software_reseller/__manifest__.py
index 354ea7191b..a0375e7c00 100644
--- a/software_reseller/__manifest__.py
+++ b/software_reseller/__manifest__.py
@@ -35,6 +35,7 @@
         'data/knowledge_tour.xml',
     ],
     'demo': [
+        'demo/res_config_settings.xml',
         'demo/res_partner.xml',
         'demo/hr_employee.xml',
         'demo/product_supplierinfo.xml',
diff --git a/software_reseller/demo/res_config_settings.xml b/software_reseller/demo/res_config_settings.xml
new file mode 100644
index 0000000000..dfb6fc7a9f
--- /dev/null
+++ b/software_reseller/demo/res_config_settings.xml
@@ -0,0 +1,8 @@
+
+
+    
+        
+        
+    
+    
+
diff --git a/solar_installation/__manifest__.py b/solar_installation/__manifest__.py
index 38624a304e..95dd001fd8 100644
--- a/solar_installation/__manifest__.py
+++ b/solar_installation/__manifest__.py
@@ -55,6 +55,8 @@
         'data/knowledge_tour.xml',
     ],
     'demo': [
+        'demo/res_config_settings.xml',
+
         'demo/res_partner.xml',
         'demo/crm_tag.xml',
         'demo/crm_lead.xml',
diff --git a/solar_installation/demo/res_config_settings.xml b/solar_installation/demo/res_config_settings.xml
new file mode 100644
index 0000000000..3c28d37a40
--- /dev/null
+++ b/solar_installation/demo/res_config_settings.xml
@@ -0,0 +1,8 @@
+
+
+    
+        
+        
+    
+    
+
diff --git a/surveyor/__manifest__.py b/surveyor/__manifest__.py
index 50986019d2..0fd450c2f8 100644
--- a/surveyor/__manifest__.py
+++ b/surveyor/__manifest__.py
@@ -35,6 +35,8 @@
         'data/knowledge_tour.xml',
     ],
     'demo': [
+        'demo/res_config_settings.xml',
+
         'demo/res_partner.xml',
         'demo/crm_stage.xml',
         'demo/crm_lead.xml',
diff --git a/surveyor/demo/res_config_settings.xml b/surveyor/demo/res_config_settings.xml
new file mode 100644
index 0000000000..575a798a75
--- /dev/null
+++ b/surveyor/demo/res_config_settings.xml
@@ -0,0 +1,8 @@
+
+
+    
+        
+        
+    
+    
+