FS-6222 --resolve