FS-5717 --resolve