FS-6194 --resolve