[TKWA-272] TKWA-272