ADEN-1265 Fix order of Evolve vs SevenOneMedia