DIO-12674

DIO-12674