FS-5377 --resolve