ADEN-1521 CR fixes