Aden-1516 cr fixes