FS-5769 --resolve