CDITCK-317 changes

CDITCK-317 changes