FS-5290 --resolve