ADEN-975 More CR updates