FS-5571 --resolve