[ENDX-509] ENDX-509