FS-5351 --resolve