FS-5777 --resolve