FS-5214 --resolve