FS-6397 --resolve