ADEN-644 cr fixes applied