FS-5355 --resolve