[TKWA-248] TKWA-248