FS-6386 --resolve