[TKWA-228] TKWA-228