ADEN-1395 CR fixes