FS-5168 --resolve