FS-5265 --resolve