FS-5340 --resolve