[SDJS-285] SDJS-285