ADEN-1427-final-selectors