[FSET-617]