FS-5436 --resolve