ADEN-922 cr fixes round 3