FS-5598 --resolve