Merge branch prs/66467

diff --cc src/pybind/mgr/dashboard/plugins/feature_toggles.py
index 6ff3931bd1479a454286cf7ee70a66492c090963,869ef04ac1961cf9b160aebcd2f6faf046fcc581..0ee72fa794fae0f233d116f767bc1d906460af38
--- 1/src/pybind/mgr/dashboard/plugins/feature_toggles.py
--- 2/src/pybind/mgr/dashboard/plugins/feature_toggles.py
+++ b/src/pybind/mgr/dashboard/plugins/feature_toggles.py
@@@ -1,12 -1,13 +1,13 @@@
  # -*- coding: utf-8 -*-
  
  from enum import Enum
 -from typing import Dict, List, Optional, Set, no_type_check
 +from typing import Dict, List, Optional, Set
  
  import cherrypy
- from mgr_module import CLICommand, Option
+ from mgr_module import Option
  from mgr_util import CLIWarning
  
+ from ..cli import DBCLICommand
  from ..controllers.cephfs import CephFS
  from ..controllers.iscsi import Iscsi, IscsiTarget
  from ..controllers.nfs import NFSGaneshaExports, NFSGaneshaUi

diff --cc src/pybind/mgr/dashboard/services/nvmeof_cli.py
Simple merge

diff --cc src/pybind/mgr/dashboard/tests/test_nvmeof_cli.py
Simple merge