[STARS-935] STARS-935