ADEN-1172 cr fixes