FS-5701 --resolve