ADEN-833 cr fixes