[JUFD-667]