FS-5565 --resolve