FS-4568 --resolve