store: Wrap grouping in a separate transaction in case it fails due to reentrancy
store: Wrap grouping in a separate transaction in case it fails due to reentrancy

akx/gentry,akx/gentry,akx/gentry,akx/gentry