ADEN-1074 CR changes