FS-5882 --resolve