adds fix to force assign menu items to correct groups

Closes #3610835

Merge request reports

Loading