FS-6198 --resolve