ADEN-745 cr fixes