[ENDX-389]