FS-5444 --resolve