FS-5917 --resolve