Upon renewal of a Contract, a user has reported that bundles are being created without preserving the structure. This leads to validation errors and unwanted pr...