FS-5314 --resolve