ADEN-1393 CR fixes