Bug 1067404: Handling additional storage correctly at the group level