DRI-11368

DRI-11368