Changes to support DTK-738