Merge branch 'remove-regex' into 'main'

fix: move back to glob patterns for grouping in agent

See merge request !968