FS-5779 --resolve