[FSET-677]