FS-5407 --resolve