FS-5194 --resolve