FS-5272 --resolve