FS-5418 --resolve