[ENDX-514] ENDX-514