Fixes #3773
remove debug group
Merge branch 'hotfix/5820'

Close #5820
Merge pull request #5836 from steverhoades/hotfix/3773

Fixes #3773
Merge branch 'hotfix/5836' into develop

Forward port #5836