FS-5925 --resolve