FS-5633 --resolve