ADEN-744 CR fixes