FS-5610 --resolve