[FSET-651]