[ENDX-469] ENDX-469