FS-5410 --resolve