FS-6202 --resolve