FS-5002 --resolve