Merge branch '186-group-debugging-parameters' into 'main'

Group debugging parameters/options at one block

See merge request !247