We probably want to update the CreateBundle also to the bundle standards, this will have to be in sync then.