FS-5108 --resolve