FS-6203 --resolve