FS-5196 --resolve