ADEN-646 CR fixes