FS-5731 --resolve