[TKWA-231] TKWA-231