FS-5664 --resolve