[TKWA-232] TKWA-232