Update to address DTK-1582