iCECORE-1755

iCECORE-1755