ADEN-922 cr fixes