FS-5270 --resolve