FS-5802 --resolve