FS-5116 --resolve