[TKWA-252] TKWA-252