FS-4265 --resolve