[EBWH-191] EBWH-191