FS-5766 --resolve