For ENG-6263,  fix inverted switch between DR versions