ADEN-626 CR fixes