FS-4844 --resolve