EliXiRSTAR-1373

EliXiRSTAR-1373