diff --git a/AzeriteUI/Components/UnitFrames/Units/Raid25.lua b/AzeriteUI/Components/UnitFrames/Units/Raid25.lua
index a3698d0c..4664d937 100644
--- a/AzeriteUI/Components/UnitFrames/Units/Raid25.lua
+++ b/AzeriteUI/Components/UnitFrames/Units/Raid25.lua
@@ -735,8 +735,8 @@ RaidFrame25Mod.GetHeaderAttributes = function(self)
 	"point", db.point, -- Unit anchoring within each column
 	"xOffset", db.xOffset,
 	"yOffset", db.yOffset,
-	"groupBy", db.groupBy, -- ROLE, CLASS, GROUP -- Grouping order and type
-	"groupingOrder", db.groupingOrder,
+	"groupBy", "GROUP", -- db.groupBy, -- ROLE, CLASS, GROUP -- Grouping order and type
+	"groupingOrder", "1,2,3,4,5,6,7,8", -- db.groupingOrder,
 	"unitsPerColumn", db.unitsPerColumn, -- Column setup and growth
 	"maxColumns", db.maxColumns,
 	"columnSpacing", db.columnSpacing,
diff --git a/AzeriteUI/Components/UnitFrames/Units/Raid40.lua b/AzeriteUI/Components/UnitFrames/Units/Raid40.lua
index 6fc8b180..8cf042ec 100644
--- a/AzeriteUI/Components/UnitFrames/Units/Raid40.lua
+++ b/AzeriteUI/Components/UnitFrames/Units/Raid40.lua
@@ -735,8 +735,8 @@ RaidFrame40Mod.GetHeaderAttributes = function(self)
 	"point", db.point, -- Unit anchoring within each column
 	"xOffset", db.xOffset,
 	"yOffset", db.yOffset,
-	"groupBy", db.groupBy, -- ROLE, CLASS, GROUP -- Grouping order and type
-	"groupingOrder", db.groupingOrder,
+	"groupBy", "GROUP", -- db.groupBy, -- ROLE, CLASS, GROUP -- Grouping order and type
+	"groupingOrder", "1,2,3,4,5,6,7,8", -- db.groupingOrder,
 	"unitsPerColumn", db.unitsPerColumn, -- Column setup and growth
 	"maxColumns", db.maxColumns,
 	"columnSpacing", db.columnSpacing,
diff --git a/AzeriteUI/Core/Common/Compatibility.lua b/AzeriteUI/Core/Common/Compatibility.lua
index 21e5ef43..85ac8242 100644
--- a/AzeriteUI/Core/Common/Compatibility.lua
+++ b/AzeriteUI/Core/Common/Compatibility.lua
@@ -47,6 +47,10 @@ if (not _G.UnitHasVehicleUI) then
 	_G.UnitHasVehicleUI = function() return false end
 end
 
+if (not _G.GetTimeToWellRested) then
+	_G.GetTimeToWellRested = function() return nil end
+end
+
 local tocversion = select(4, GetBuildInfo())
 
 -- Deprecated in 10.1.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 381eac47..1238f5c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,12 @@ All notable changes to this project will be documented in this file. Be aware th
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased] 2024-04-03
+## [5.2.165-RC] 2024-04-04
+### Changed
+- Default unit frame grouping in raid(15) and raid(40) group frames is now by player group, not by role as previously. Options of this is coming.
+
 ### Fixed
+- Fixed `GetTimeToWellRested` nil bug when hovering over the XP bar in SoD phase 3.
 - Actionbutton fading should be updated instantly when moving abilities around.
 
 ## [5.2.164-RC] 2024-04-03