FS-5791 --resolve