[ENDX-435] ENDX-435