Combining multi-asset and intrinsic risk measures