FS-5389 --resolve