[ENDS-188] ENDS-188