diff --git a/plugins/PaintTool/PaintTool.py b/plugins/PaintTool/PaintTool.py
index a1812a5766..4ecee7dd85 100644
--- a/plugins/PaintTool/PaintTool.py
+++ b/plugins/PaintTool/PaintTool.py
@@ -216,7 +216,11 @@ class PaintTool(Tool):
         pt = self._picking_pass.getPickedPosition(x, y).getData()
 
         va, vb, vc = self._mesh_transformed_cache.getFaceNodes(face_id)
-        ta, tb, tc = node.getMeshData().getFaceUvCoords(face_id)
+
+        face_uv_coordinates = node.getMeshData().getFaceUvCoords(face_id)
+        if face_uv_coordinates is None:
+            return face_id, None
+        ta, tb, tc = face_uv_coordinates
 
         # 'Weight' of each vertex that would produce point pt, so we can generate the texture coordinates from the uv ones of the vertices.
         # See (also) https://mathworld.wolfram.com/BarycentricCoordinates.html
diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_cpe-plus_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_cpe-plus_0.2mm_engineering.inst.cfg
new file mode 100644
index 0000000000..21e814e112
--- /dev/null
+++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_cpe-plus_0.2mm_engineering.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_s8
+name = Accurate
+version = 4
+
+[metadata]
+intent_category = engineering
+material = generic_cpe_plus
+quality_type = draft
+setting_version = 25
+type = intent
+variant = AA+ 0.4
+
+[values]
+infill_sparse_density = 20
+top_bottom_thickness = =wall_thickness
+wall_thickness = =line_width * 4
+
diff --git a/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pc_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pc_0.2mm_engineering.inst.cfg
new file mode 100644
index 0000000000..8332ecacbc
--- /dev/null
+++ b/resources/intent/ultimaker_s8/um_s8_aa_plus_0.4_pc_0.2mm_engineering.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_s8
+name = Accurate
+version = 4
+
+[metadata]
+intent_category = engineering
+material = generic_pc
+quality_type = draft
+setting_version = 25
+type = intent
+variant = AA+ 0.4
+
+[values]
+infill_sparse_density = 20
+top_bottom_thickness = =wall_thickness
+wall_thickness = =line_width * 4
+
diff --git a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_cpe-plus_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_cpe-plus_0.2mm_engineering.inst.cfg
index a474c19cf7..832912a022 100644
--- a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_cpe-plus_0.2mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_cpe-plus_0.2mm_engineering.inst.cfg
@@ -5,6 +5,7 @@ version = 4
 
 [metadata]
 intent_category = engineering
+is_experimental = True
 material = generic_cpe_plus
 quality_type = draft
 setting_version = 25
diff --git a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg
index e5ccc32e49..a0e65969e9 100644
--- a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm_engineering.inst.cfg
@@ -5,6 +5,7 @@ version = 4
 
 [metadata]
 intent_category = engineering
+is_experimental = True
 material = generic_nylon-cf-slide
 quality_type = draft
 setting_version = 25
diff --git a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_pc_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_pc_0.2mm_engineering.inst.cfg
index cecb670819..f40d2509b6 100644
--- a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_pc_0.2mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_pc_0.2mm_engineering.inst.cfg
@@ -5,6 +5,7 @@ version = 4
 
 [metadata]
 intent_category = engineering
+is_experimental = True
 material = generic_pc
 quality_type = draft
 setting_version = 25
diff --git a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm_engineering.inst.cfg
index 0819ec9c81..824018a1d5 100644
--- a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm_engineering.inst.cfg
@@ -5,6 +5,7 @@ version = 4
 
 [metadata]
 intent_category = engineering
+is_experimental = True
 material = generic_petcf
 quality_type = draft
 setting_version = 25
diff --git a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg
new file mode 100644
index 0000000000..8cbb513108
--- /dev/null
+++ b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.2mm_engineering.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_s8
+name = Accurate
+version = 4
+
+[metadata]
+intent_category = engineering
+material = generic_nylon-cf-slide
+quality_type = draft
+setting_version = 25
+type = intent
+variant = CC+ 0.6
+
+[values]
+infill_sparse_density = 20
+top_bottom_thickness = =wall_thickness
+wall_thickness = =line_width * 4
+
diff --git a/resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm_engineering.inst.cfg
new file mode 100644
index 0000000000..5384f380ac
--- /dev/null
+++ b/resources/intent/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm_engineering.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_s8
+name = Accurate
+version = 4
+
+[metadata]
+intent_category = engineering
+material = generic_petcf
+quality_type = draft
+setting_version = 25
+type = intent
+variant = CC+ 0.6
+
+[values]
+infill_sparse_density = 20
+top_bottom_thickness = =wall_thickness
+wall_thickness = =line_width * 4
+
diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_cpe-plus_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_cpe-plus_0.2mm.inst.cfg
new file mode 100644
index 0000000000..9ca2677c01
--- /dev/null
+++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_cpe-plus_0.2mm.inst.cfg
@@ -0,0 +1,19 @@
+[general]
+definition = ultimaker_s8
+name = Fast
+version = 4
+
+[metadata]
+material = generic_cpe_plus
+quality_type = draft
+setting_version = 25
+type = quality
+variant = AA+ 0.4
+weight = -2
+
+[values]
+adhesion_type = brim
+material_alternate_walls = True
+material_final_print_temperature = =material_print_temperature - 15
+material_initial_print_temperature = =material_print_temperature - 15
+
diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pc_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pc_0.2mm.inst.cfg
new file mode 100644
index 0000000000..0709fe6c6c
--- /dev/null
+++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_pc_0.2mm.inst.cfg
@@ -0,0 +1,25 @@
+[general]
+definition = ultimaker_s8
+name = Fast
+version = 4
+
+[metadata]
+material = generic_pc
+quality_type = draft
+setting_version = 25
+type = quality
+variant = AA+ 0.4
+weight = -2
+
+[values]
+adhesion_type = brim
+cool_min_layer_time = 6
+cool_min_layer_time_fan_speed_max = 12
+inset_direction = inside_out
+material_alternate_walls = True
+material_final_print_temperature = =material_print_temperature - 15
+material_flow = 95
+material_initial_print_temperature = =material_print_temperature - 15
+retraction_prime_speed = 15
+speed_wall_x = =speed_wall_0
+
diff --git a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm.inst.cfg
index baabd79e94..a22e4fbeec 100644
--- a/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s8/um_s8_aa_plus_0.4_petg_0.2mm.inst.cfg
@@ -15,4 +15,5 @@ weight = -2
 cool_min_layer_time = 4
 material_print_temperature = =default_material_print_temperature + 5
 retraction_prime_speed = 15
+support_structure = tree
 
diff --git a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_cpe-plus_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_cpe-plus_0.2mm.inst.cfg
index 3475b01999..80d65e7955 100644
--- a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_cpe-plus_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_cpe-plus_0.2mm.inst.cfg
@@ -1,9 +1,10 @@
 [general]
 definition = ultimaker_s8
-name = Fast
+name = Fast - Experimental
 version = 4
 
 [metadata]
+is_experimental = True
 material = generic_cpe_plus
 quality_type = draft
 setting_version = 25
diff --git a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm.inst.cfg
index 1085302fc7..5f3180ef4e 100644
--- a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_nylon-cf-slide_0.2mm.inst.cfg
@@ -1,9 +1,10 @@
 [general]
 definition = ultimaker_s8
-name = Fast
+name = Fast - Experimental
 version = 4
 
 [metadata]
+is_experimental = True
 material = generic_nylon-cf-slide
 quality_type = draft
 setting_version = 25
@@ -12,6 +13,12 @@ variant = CC+ 0.4
 weight = -2
 
 [values]
+bridge_skin_material_flow = 100
+bridge_skin_speed = 30
+bridge_wall_material_flow = 100
+bridge_wall_speed = 30
 cool_min_layer_time_fan_speed_max = 11
 retraction_prime_speed = 15
+support_structure = tree
+wall_overhang_speed_factors = [100,90,80,70,60,50]
 
diff --git a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_pc_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_pc_0.2mm.inst.cfg
index bb73d83750..540d62e154 100644
--- a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_pc_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_pc_0.2mm.inst.cfg
@@ -1,9 +1,10 @@
 [general]
 definition = ultimaker_s8
-name = Fast
+name = Fast - Experimental
 version = 4
 
 [metadata]
+is_experimental = True
 material = generic_pc
 quality_type = draft
 setting_version = 25
diff --git a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm.inst.cfg
index 0038bb0a4d..3467ed5ded 100644
--- a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.4_petcf_0.2mm.inst.cfg
@@ -1,9 +1,10 @@
 [general]
 definition = ultimaker_s8
-name = Fast
+name = Fast - Experimental
 version = 4
 
 [metadata]
+is_experimental = True
 material = generic_petcf
 quality_type = draft
 setting_version = 25
@@ -12,5 +13,12 @@ variant = CC+ 0.4
 weight = -2
 
 [values]
+adhesion_type = skirt
+bridge_skin_material_flow = 100
+bridge_skin_speed = 30
+bridge_wall_material_flow = 100
+bridge_wall_speed = 30
+support_structure = tree
 switch_extruder_retraction_amount = 16
+wall_overhang_speed_factors = [100,90,80,70,60,50]
 
diff --git a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.2mm.inst.cfg
new file mode 100644
index 0000000000..eb29199252
--- /dev/null
+++ b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_nylon-cf-slide_0.2mm.inst.cfg
@@ -0,0 +1,60 @@
+[general]
+definition = ultimaker_s8
+name = Fast
+version = 4
+
+[metadata]
+material = generic_nylon-cf-slide
+quality_type = draft
+setting_version = 25
+type = quality
+variant = CC+ 0.6
+weight = -2
+
+[values]
+acceleration_roofing = =acceleration_topbottom/2
+bridge_enable_more_layers = True
+bridge_skin_density = 70
+bridge_skin_material_flow = 100
+bridge_skin_material_flow_2 = 70
+bridge_skin_speed = 30
+bridge_skin_speed_2 = =speed_print*2/3
+bridge_wall_material_flow = 100
+bridge_wall_min_length = 2
+bridge_wall_speed = 30
+cool_min_layer_time = 6
+cool_min_layer_time_fan_speed_max = 11
+cool_min_layer_time_overhang = 11
+cool_min_temperature = =material_print_temperature-10
+flooring_monotonic = False
+infill_material_flow = =material_flow if infill_sparse_density < 95 else 95
+infill_pattern = ='zigzag' if infill_sparse_density > 50 else 'grid'
+jerk_roofing = =jerk_print
+material_flow = 95
+retraction_hop_enabled = False
+retraction_prime_speed = 25
+roofing_line_width = 0.5
+roofing_material_flow = =skin_material_flow
+roofing_monotonic = False
+skin_material_flow = =0.95*material_flow
+skin_outline_count = 0
+speed_print = 80
+speed_roofing = 50
+speed_wall = =speed_print
+speed_wall_0_roofing = =speed_roofing
+speed_wall_x_roofing = =speed_roofing
+support_bottom_distance = =support_z_distance
+support_line_width = 0.6
+support_structure = tree
+support_tree_tip_diameter = 2.0
+support_tree_top_rate = 10
+support_xy_distance = 1.2
+support_xy_distance_overhang = =1.5*machine_nozzle_size
+support_z_distance = =min(2*layer_height, 0.4)
+top_bottom_thickness = =wall_thickness
+wall_0_inset = =0.05
+wall_line_width_0 = 0.5
+wall_overhang_speed_factors = [100,90,80,70,60,50]
+wall_x_material_flow = =material_flow
+xy_offset = 0.075
+
diff --git a/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm.inst.cfg
new file mode 100644
index 0000000000..b568f01cde
--- /dev/null
+++ b/resources/quality/ultimaker_s8/um_s8_cc_plus_0.6_petcf_0.2mm.inst.cfg
@@ -0,0 +1,63 @@
+[general]
+definition = ultimaker_s8
+name = Fast
+version = 4
+
+[metadata]
+material = generic_petcf
+quality_type = draft
+setting_version = 25
+type = quality
+variant = CC+ 0.6
+weight = -2
+
+[values]
+acceleration_roofing = =acceleration_topbottom/2
+adhesion_type = skirt
+bridge_enable_more_layers = True
+bridge_skin_density = 70
+bridge_skin_material_flow = 100
+bridge_skin_material_flow_2 = 70
+bridge_skin_speed = 30
+bridge_skin_speed_2 = =speed_print*2/3
+bridge_wall_material_flow = 100
+bridge_wall_min_length = 2
+bridge_wall_speed = 30
+cool_min_layer_time = 6
+cool_min_layer_time_overhang = 11
+cool_min_temperature = =material_print_temperature-10
+flooring_monotonic = False
+infill_material_flow = =material_flow if infill_sparse_density < 95 else 95
+infill_pattern = ='zigzag' if infill_sparse_density > 50 else 'grid'
+jerk_roofing = =jerk_print
+material_pressure_advance_factor = 0.25
+retraction_hop_enabled = False
+retraction_prime_speed = 15
+roofing_line_width = 0.5
+roofing_material_flow = =skin_material_flow
+roofing_monotonic = False
+skin_material_flow = =0.95*material_flow
+skin_outline_count = 0
+skirt_height = 5
+speed_print = 80
+speed_roofing = 50
+speed_wall = =speed_print
+speed_wall_0_roofing = =speed_roofing
+speed_wall_x_roofing = =speed_roofing
+support_bottom_distance = =support_z_distance
+support_interface_enable = False
+support_line_width = 0.6
+support_structure = tree
+support_tree_tip_diameter = 2.0
+support_tree_top_rate = 10
+support_xy_distance = 1.2
+support_xy_distance_overhang = =1.5*machine_nozzle_size
+support_z_distance = =min(2*layer_height, 0.4)
+switch_extruder_retraction_amount = 16
+top_bottom_thickness = =wall_thickness
+wall_0_inset = =0.05
+wall_line_width_0 = 0.5
+wall_overhang_speed_factors = [100,90,80,70,60,50]
+wall_x_material_flow = =material_flow
+xy_offset = 0.075
+
diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt
index c432a9e309..af983e621c 100644
--- a/resources/texts/change_log.txt
+++ b/resources/texts/change_log.txt
@@ -1,3 +1,10 @@
+[5.10.2]
+
+* UltiMaker S6 and S8 improvements:
+- Introduced the CC+ 0.6 core to the UltiMaker S6 and S8. This core delivers better results for demanding applications and will be replacing the CC+ 0.4 core.
+- Added new profiles for PC and CPE+ on UltiMaker S6 and S8
+- Updated the default support type for the PETG material for UltiMaker S6 and S8
+
 [5.10.1]
 
 * New features and improvements:
diff --git a/resources/variants/ultimaker_s6_cc_plus06.inst.cfg b/resources/variants/ultimaker_s6_cc_plus06.inst.cfg
new file mode 100644
index 0000000000..93564bada0
--- /dev/null
+++ b/resources/variants/ultimaker_s6_cc_plus06.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+definition = ultimaker_s6
+name = CC+ 0.6
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 25
+type = variant
+
+[values]
+machine_nozzle_cool_down_speed = 0.9
+machine_nozzle_id = CC+ 0.6
+machine_nozzle_size = 0.6
+machine_nozzle_tip_outer_diameter = 1.2
+retraction_prime_speed = =retraction_speed
+
diff --git a/resources/variants/ultimaker_s8_cc_plus06.inst.cfg b/resources/variants/ultimaker_s8_cc_plus06.inst.cfg
new file mode 100644
index 0000000000..2a1c43873f
--- /dev/null
+++ b/resources/variants/ultimaker_s8_cc_plus06.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+definition = ultimaker_s8
+name = CC+ 0.6
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 25
+type = variant
+
+[values]
+machine_nozzle_cool_down_speed = 0.9
+machine_nozzle_id = CC+ 0.6
+machine_nozzle_size = 0.6
+machine_nozzle_tip_outer_diameter = 1.2
+retraction_prime_speed = =retraction_speed
+