Issue #22172 - Added Item Groups to core modules