FS-5797 --resolve