FS-5185 --resolve