FS-5513 --resolve