ADEN-1201 CR changes