ADEN-1156 CR changes