merged dev into uconn-2