FS-5036 --resolve