FS-5840 --resolve