FS-5993 --resolve