FS-5180 --resolve