[ENDX-512] ENDX-512