[TKWA-260] TKWA-260