FS-5997 --resolve