FS-5094 --resolve