diff --git a/lib/tablelib.php b/lib/tablelib.php
index 2488defbc0801..11e66394afa83 100644
--- a/lib/tablelib.php
+++ b/lib/tablelib.php
@@ -1143,6 +1143,12 @@ public function get_row_cells_html(string $rowid, array $row, ?array $suppressla
         foreach ($row as $index => $data) {
             $column = $colbyindex[$index];
 
+            $columnattributes = $this->columnsattributes[$column] ?? [];
+            if (isset($columnattributes['class'])) {
+                $this->column_class($column, $columnattributes['class']);
+                unset($columnattributes['class']);
+            }
+
             $attributes = [
                 'class' => "cell c{$index}" . $this->column_class[$column],
                 'id' => "{$rowid}_c{$index}",
@@ -1155,7 +1161,7 @@ public function get_row_cells_html(string $rowid, array $row, ?array $suppressla
                 $attributes['scope'] = 'row';
             }
 
-            $attributes += $this->columnsattributes[$column] ?? [];
+            $attributes += $columnattributes;
 
             if (empty($this->prefs['collapse'][$column])) {
                 if ($this->column_suppress[$column] && $suppresslastrow !== null && $suppresslastrow[$index] === $data) {
diff --git a/lib/upgrade.txt b/lib/upgrade.txt
index d1ed718983d0e..5649c387b8f6a 100644
--- a/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@ -1,6 +1,10 @@
 This files describes API changes in core libraries and APIs,
 information provided here is intended especially for developers.
 
+=== 4.0.7 ===
+
+* The method `flexible_table::set_columnsattributes` now can be used with 'class' key to add custom classes to the DOM.
+
 === 4.0.6 ===
 
 * There is a new helper function mtrace_exception to help with reporting exceptions you have caught in scheduled tasks.