ADEN-575 CR fixes