FS-5359 --resolve