FS-5844 --resolve