ADEN-833 cr fixes round 2