ADEN-591 CR fixes