[TKWA-239] TKWA-239