FS-5848 --resolve