FS-5103 --resolve