[UMSO-476] UMSO-476