FS-6236 --resolve