FS-5737 --resolve