FS-5014 --resolve