FS-5991 --resolve