[STARS-940] STARS-940