FS-5933 --resolve