FS-5040 --resolve