CDITCK-317 changes