[SAWY-298] SAWY-298