ADEN-1205 CR changes