FS-4996 --resolve