Fixes #17886 - move config groups under parameters
(cherry picked from commit 9c39317be1c42bd77b339f81e8dc317dd8704f7c)
Fixes #17886 - move config groups under parameters
(cherry picked from commit 9c39317be1c42bd77b339f81e8dc317dd8704f7c)