ADEN-123 and ADEN-117 fixes for release-157