FS-5208 --resolve