FS-5406 --resolve